From 73dd81c85be90e466493bcc6f45c402d29bc7f20 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Fri, 1 Oct 2004 03:25:34 +0200 Subject: [PATCH] rnd-20041001-1-src * added more element and graphic definitions for new EMC elements --- ChangeLog | 3 + src/conf_e2g.c | 76 ++- src/conf_gfx.c | 136 +++- src/conf_gfx.h | 1542 +++++++++++++++++++++--------------------- src/conftime.h | 2 +- src/editor.c | 125 +++- src/files.c | 50 +- src/game_em/input.c | 11 + src/libgame/system.h | 1 + src/main.c | 167 ++--- src/main.h | 73 +- src/tools.c | 148 ++-- 12 files changed, 1296 insertions(+), 1038 deletions(-) diff --git a/ChangeLog b/ChangeLog index 380405c1..11a1dfed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2004-10-01 + * added more element and graphic definitions for new EMC elements + 2004-09-27 * modified native EM engine to use integrated R'n'D sound system diff --git a/src/conf_e2g.c b/src/conf_e2g.c index 2c25c619..7dd322fc 100644 --- a/src/conf_e2g.c +++ b/src/conf_e2g.c @@ -2574,8 +2574,16 @@ element_to_graphic[] = IMG_EMC_ANDROID }, { - EL_EMC_GENERATOR_BALL, -1, -1, FALSE, - IMG_EMC_GENERATOR_BALL + EL_EMC_GRASS, -1, -1, FALSE, + IMG_EMC_GRASS + }, + { + EL_EMC_MAGIC_BALL, -1, -1, FALSE, + IMG_EMC_MAGIC_BALL + }, + { + EL_EMC_MAGIC_BALL_SWITCH, -1, -1, FALSE, + IMG_EMC_MAGIC_BALL_SWITCH }, { EL_EMC_GATE_5, -1, -1, FALSE, @@ -2625,6 +2633,70 @@ element_to_graphic[] = EL_EMC_KEY_8, -1, -1, FALSE, IMG_EMC_KEY_8 }, + { + EL_EMC_BUMPER, -1, -1, FALSE, + IMG_EMC_BUMPER + }, + { + EL_EMC_PLANT, -1, -1, FALSE, + IMG_EMC_PLANT + }, + { + EL_EMC_LENSES, -1, -1, FALSE, + IMG_EMC_LENSES + }, + { + EL_EMC_MAGNIFIER, -1, -1, FALSE, + IMG_EMC_MAGNIFIER + }, + { + EL_EMC_WALL_9, -1, -1, FALSE, + IMG_EMC_WALL_9 + }, + { + EL_EMC_WALL_10, -1, -1, FALSE, + IMG_EMC_WALL_10 + }, + { + EL_EMC_WALL_11, -1, -1, FALSE, + IMG_EMC_WALL_11 + }, + { + EL_EMC_WALL_12, -1, -1, FALSE, + IMG_EMC_WALL_12 + }, + { + EL_EMC_WALL_13, -1, -1, FALSE, + IMG_EMC_WALL_13 + }, + { + EL_EMC_WALL_14, -1, -1, FALSE, + IMG_EMC_WALL_14 + }, + { + EL_EMC_WALL_15, -1, -1, FALSE, + IMG_EMC_WALL_15 + }, + { + EL_EMC_WALL_16, -1, -1, FALSE, + IMG_EMC_WALL_16 + }, + { + EL_EMC_WALL_SLIPPERY_1, -1, -1, FALSE, + IMG_EMC_WALL_SLIPPERY_1 + }, + { + EL_EMC_WALL_SLIPPERY_2, -1, -1, FALSE, + IMG_EMC_WALL_SLIPPERY_2 + }, + { + EL_EMC_WALL_SLIPPERY_3, -1, -1, FALSE, + IMG_EMC_WALL_SLIPPERY_3 + }, + { + EL_EMC_WALL_SLIPPERY_4, -1, -1, FALSE, + IMG_EMC_WALL_SLIPPERY_4 + }, { EL_BD_BUTTERFLY_DOWN, -1, -1, FALSE, IMG_BD_BUTTERFLY diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 80872f45..74ef4084 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -1399,18 +1399,21 @@ struct ConfigInfo image_config[] = { "emc_steelwall_1.xpos", "14" }, { "emc_steelwall_1.ypos", "0" }, { "emc_steelwall_1.frames", "1" }, - { "emc_steelwall_2", "RocksDC.pcx" }, - { "emc_steelwall_2.xpos", "14" }, - { "emc_steelwall_2.ypos", "0" }, + { "emc_steelwall_2", "emc_object.pcx" }, + { "emc_steelwall_2.xpos", "25" }, + { "emc_steelwall_2.ypos", "20" }, { "emc_steelwall_2.frames", "1" }, - { "emc_steelwall_3", "RocksDC.pcx" }, - { "emc_steelwall_3.xpos", "14" }, - { "emc_steelwall_3.ypos", "0" }, + { "emc_steelwall_2.scale_up_factor", "2" }, + { "emc_steelwall_3", "emc_object.pcx" }, + { "emc_steelwall_3.xpos", "25" }, + { "emc_steelwall_3.ypos", "21" }, { "emc_steelwall_3.frames", "1" }, - { "emc_steelwall_4", "RocksDC.pcx" }, - { "emc_steelwall_4.xpos", "14" }, - { "emc_steelwall_4.ypos", "0" }, + { "emc_steelwall_3.scale_up_factor", "2" }, + { "emc_steelwall_4", "emc_object.pcx" }, + { "emc_steelwall_4.xpos", "25" }, + { "emc_steelwall_4.ypos", "22" }, { "emc_steelwall_4.frames", "1" }, + { "emc_steelwall_4.scale_up_factor", "2" }, { "emc_wall_1", "RocksDC.pcx" }, { "emc_wall_1.xpos", "13" }, @@ -1440,10 +1443,11 @@ struct ConfigInfo image_config[] = { "emc_wall_7.xpos", "15" }, { "emc_wall_7.ypos", "2" }, { "emc_wall_7.frames", "1" }, - { "emc_wall_8", "RocksDC.pcx" }, - { "emc_wall_8.xpos", "14" }, - { "emc_wall_8.ypos", "1" }, + { "emc_wall_8", "emc_object.pcx" }, + { "emc_wall_8.xpos", "25" }, + { "emc_wall_8.ypos", "31" }, { "emc_wall_8.frames", "1" }, + { "emc_wall_8.scale_up_factor", "2" }, /* images for Diamond Caves style elements and actions */ @@ -3229,11 +3233,23 @@ struct ConfigInfo image_config[] = { "emc_android.frames", "1" }, { "emc_android.scale_up_factor", "2" }, - { "emc_generator_ball", "emc_object.pcx" }, - { "emc_generator_ball.xpos", "22" }, - { "emc_generator_ball.ypos", "18" }, - { "emc_generator_ball.frames", "1" }, - { "emc_generator_ball.scale_up_factor", "2" }, + { "emc_grass", "emc_object.pcx" }, + { "emc_grass.xpos", "20" }, + { "emc_grass.ypos", "5" }, + { "emc_grass.frames", "1" }, + { "emc_grass.scale_up_factor", "2" }, + + { "emc_magic_ball", "emc_object.pcx" }, + { "emc_magic_ball.xpos", "22" }, + { "emc_magic_ball.ypos", "18" }, + { "emc_magic_ball.frames", "1" }, + { "emc_magic_ball.scale_up_factor", "2" }, + + { "emc_magic_ball_switch", "emc_object.pcx" }, + { "emc_magic_ball_switch.xpos", "25" }, + { "emc_magic_ball_switch.ypos", "10" }, + { "emc_magic_ball_switch.frames", "1" }, + { "emc_magic_ball_switch.scale_up_factor", "2" }, { "emc_gate_5", "emc_object.pcx" }, { "emc_gate_5.xpos", "24" }, @@ -3297,6 +3313,92 @@ struct ConfigInfo image_config[] = { "emc_key_8.frames", "1" }, { "emc_key_8.scale_up_factor", "2" }, + { "emc_bumper", "emc_object.pcx" }, + { "emc_bumper.xpos", "25" }, + { "emc_bumper.ypos", "3" }, + { "emc_bumper.frames", "1" }, + { "emc_bumper.scale_up_factor", "2" }, + + { "emc_plant", "emc_object.pcx" }, + { "emc_plant.xpos", "25" }, + { "emc_plant.ypos", "12" }, + { "emc_plant.frames", "1" }, + { "emc_plant.scale_up_factor", "2" }, + + { "emc_lenses", "emc_object.pcx" }, + { "emc_lenses.xpos", "25" }, + { "emc_lenses.ypos", "13" }, + { "emc_lenses.frames", "1" }, + { "emc_lenses.scale_up_factor", "2" }, + + { "emc_magnifier", "emc_object.pcx" }, + { "emc_magnifier.xpos", "25" }, + { "emc_magnifier.ypos", "14" }, + { "emc_magnifier.frames", "1" }, + { "emc_magnifier.scale_up_factor", "2" }, + + { "emc_wall_9", "emc_object.pcx" }, + { "emc_wall_9.xpos", "26" }, + { "emc_wall_9.ypos", "4" }, + { "emc_wall_9.frames", "1" }, + { "emc_wall_9.scale_up_factor", "2" }, + { "emc_wall_10", "emc_object.pcx" }, + { "emc_wall_10.xpos", "26" }, + { "emc_wall_10.ypos", "5" }, + { "emc_wall_10.frames", "1" }, + { "emc_wall_10.scale_up_factor", "2" }, + { "emc_wall_11", "emc_object.pcx" }, + { "emc_wall_11.xpos", "26" }, + { "emc_wall_11.ypos", "9" }, + { "emc_wall_11.frames", "1" }, + { "emc_wall_11.scale_up_factor", "2" }, + { "emc_wall_12", "emc_object.pcx" }, + { "emc_wall_12.xpos", "26" }, + { "emc_wall_12.ypos", "10" }, + { "emc_wall_12.frames", "1" }, + { "emc_wall_12.scale_up_factor", "2" }, + { "emc_wall_13", "emc_object.pcx" }, + { "emc_wall_13.xpos", "25" }, + { "emc_wall_13.ypos", "23" }, + { "emc_wall_13.frames", "1" }, + { "emc_wall_13.scale_up_factor", "2" }, + { "emc_wall_14", "emc_object.pcx" }, + { "emc_wall_14.xpos", "25" }, + { "emc_wall_14.ypos", "24" }, + { "emc_wall_14.frames", "1" }, + { "emc_wall_14.scale_up_factor", "2" }, + { "emc_wall_15", "emc_object.pcx" }, + { "emc_wall_15.xpos", "25" }, + { "emc_wall_15.ypos", "25" }, + { "emc_wall_15.frames", "1" }, + { "emc_wall_15.scale_up_factor", "2" }, + { "emc_wall_16", "emc_object.pcx" }, + { "emc_wall_16.xpos", "25" }, + { "emc_wall_16.ypos", "26" }, + { "emc_wall_16.frames", "1" }, + { "emc_wall_16.scale_up_factor", "2" }, + + { "emc_wall_slippery_1", "emc_object.pcx" }, + { "emc_wall_slippery_1.xpos", "25" }, + { "emc_wall_slippery_1.ypos", "27" }, + { "emc_wall_slippery_1.frames", "1" }, + { "emc_wall_slippery_1.scale_up_factor", "2" }, + { "emc_wall_slippery_2", "emc_object.pcx" }, + { "emc_wall_slippery_2.xpos", "25" }, + { "emc_wall_slippery_2.ypos", "28" }, + { "emc_wall_slippery_2.frames", "1" }, + { "emc_wall_slippery_2.scale_up_factor", "2" }, + { "emc_wall_slippery_3", "emc_object.pcx" }, + { "emc_wall_slippery_3.xpos", "25" }, + { "emc_wall_slippery_3.ypos", "29" }, + { "emc_wall_slippery_3.frames", "1" }, + { "emc_wall_slippery_3.scale_up_factor", "2" }, + { "emc_wall_slippery_4", "emc_object.pcx" }, + { "emc_wall_slippery_4.xpos", "25" }, + { "emc_wall_slippery_4.ypos", "30" }, + { "emc_wall_slippery_4.frames", "1" }, + { "emc_wall_slippery_4.scale_up_factor", "2" }, + #include "conf_chr.c" /* include auto-generated data structure definitions */ #include "conf_cus.c" /* include auto-generated data structure definitions */ #include "conf_grp.c" /* include auto-generated data structure definitions */ diff --git a/src/conf_gfx.h b/src/conf_gfx.h index 84fb794b..ecc3f536 100644 --- a/src/conf_gfx.h +++ b/src/conf_gfx.h @@ -676,768 +676,786 @@ #define IMG_TRIGGER_PLAYER 655 #define IMG_BALLOON_SWITCH_NONE 656 #define IMG_EMC_ANDROID 657 -#define IMG_EMC_GENERATOR_BALL 658 -#define IMG_EMC_GATE_5 659 -#define IMG_EMC_GATE_5_GRAY 660 -#define IMG_EMC_GATE_6 661 -#define IMG_EMC_GATE_6_GRAY 662 -#define IMG_EMC_GATE_7 663 -#define IMG_EMC_GATE_7_GRAY 664 -#define IMG_EMC_GATE_8 665 -#define IMG_EMC_GATE_8_GRAY 666 -#define IMG_EMC_KEY_5 667 -#define IMG_EMC_KEY_6 668 -#define IMG_EMC_KEY_7 669 -#define IMG_EMC_KEY_8 670 -#define IMG_CHAR_SPACE 671 -#define IMG_CHAR_EXCLAM 672 -#define IMG_CHAR_QUOTEDBL 673 -#define IMG_CHAR_NUMBERSIGN 674 -#define IMG_CHAR_DOLLAR 675 -#define IMG_CHAR_PROCENT 676 -#define IMG_CHAR_AMPERSAND 677 -#define IMG_CHAR_APOSTROPHE 678 -#define IMG_CHAR_PARENLEFT 679 -#define IMG_CHAR_PARENRIGHT 680 -#define IMG_CHAR_ASTERISK 681 -#define IMG_CHAR_PLUS 682 -#define IMG_CHAR_COMMA 683 -#define IMG_CHAR_MINUS 684 -#define IMG_CHAR_PERIOD 685 -#define IMG_CHAR_SLASH 686 -#define IMG_CHAR_0 687 -#define IMG_CHAR_1 688 -#define IMG_CHAR_2 689 -#define IMG_CHAR_3 690 -#define IMG_CHAR_4 691 -#define IMG_CHAR_5 692 -#define IMG_CHAR_6 693 -#define IMG_CHAR_7 694 -#define IMG_CHAR_8 695 -#define IMG_CHAR_9 696 -#define IMG_CHAR_COLON 697 -#define IMG_CHAR_SEMICOLON 698 -#define IMG_CHAR_LESS 699 -#define IMG_CHAR_EQUAL 700 -#define IMG_CHAR_GREATER 701 -#define IMG_CHAR_QUESTION 702 -#define IMG_CHAR_AT 703 -#define IMG_CHAR_A 704 -#define IMG_CHAR_B 705 -#define IMG_CHAR_C 706 -#define IMG_CHAR_D 707 -#define IMG_CHAR_E 708 -#define IMG_CHAR_F 709 -#define IMG_CHAR_G 710 -#define IMG_CHAR_H 711 -#define IMG_CHAR_I 712 -#define IMG_CHAR_J 713 -#define IMG_CHAR_K 714 -#define IMG_CHAR_L 715 -#define IMG_CHAR_M 716 -#define IMG_CHAR_N 717 -#define IMG_CHAR_O 718 -#define IMG_CHAR_P 719 -#define IMG_CHAR_Q 720 -#define IMG_CHAR_R 721 -#define IMG_CHAR_S 722 -#define IMG_CHAR_T 723 -#define IMG_CHAR_U 724 -#define IMG_CHAR_V 725 -#define IMG_CHAR_W 726 -#define IMG_CHAR_X 727 -#define IMG_CHAR_Y 728 -#define IMG_CHAR_Z 729 -#define IMG_CHAR_BRACKETLEFT 730 -#define IMG_CHAR_BACKSLASH 731 -#define IMG_CHAR_BRACKETRIGHT 732 -#define IMG_CHAR_ASCIICIRCUM 733 -#define IMG_CHAR_UNDERSCORE 734 -#define IMG_CHAR_COPYRIGHT 735 -#define IMG_CHAR_AUMLAUT 736 -#define IMG_CHAR_OUMLAUT 737 -#define IMG_CHAR_UUMLAUT 738 -#define IMG_CHAR_DEGREE 739 -#define IMG_CHAR_TRADEMARK 740 -#define IMG_CHAR_CURSOR 741 -#define IMG_CUSTOM_1 742 -#define IMG_CUSTOM_1_EDITOR 743 -#define IMG_CUSTOM_2 744 -#define IMG_CUSTOM_2_EDITOR 745 -#define IMG_CUSTOM_3 746 -#define IMG_CUSTOM_3_EDITOR 747 -#define IMG_CUSTOM_4 748 -#define IMG_CUSTOM_4_EDITOR 749 -#define IMG_CUSTOM_5 750 -#define IMG_CUSTOM_5_EDITOR 751 -#define IMG_CUSTOM_6 752 -#define IMG_CUSTOM_6_EDITOR 753 -#define IMG_CUSTOM_7 754 -#define IMG_CUSTOM_7_EDITOR 755 -#define IMG_CUSTOM_8 756 -#define IMG_CUSTOM_8_EDITOR 757 -#define IMG_CUSTOM_9 758 -#define IMG_CUSTOM_9_EDITOR 759 -#define IMG_CUSTOM_10 760 -#define IMG_CUSTOM_10_EDITOR 761 -#define IMG_CUSTOM_11 762 -#define IMG_CUSTOM_11_EDITOR 763 -#define IMG_CUSTOM_12 764 -#define IMG_CUSTOM_12_EDITOR 765 -#define IMG_CUSTOM_13 766 -#define IMG_CUSTOM_13_EDITOR 767 -#define IMG_CUSTOM_14 768 -#define IMG_CUSTOM_14_EDITOR 769 -#define IMG_CUSTOM_15 770 -#define IMG_CUSTOM_15_EDITOR 771 -#define IMG_CUSTOM_16 772 -#define IMG_CUSTOM_16_EDITOR 773 -#define IMG_CUSTOM_17 774 -#define IMG_CUSTOM_17_EDITOR 775 -#define IMG_CUSTOM_18 776 -#define IMG_CUSTOM_18_EDITOR 777 -#define IMG_CUSTOM_19 778 -#define IMG_CUSTOM_19_EDITOR 779 -#define IMG_CUSTOM_20 780 -#define IMG_CUSTOM_20_EDITOR 781 -#define IMG_CUSTOM_21 782 -#define IMG_CUSTOM_21_EDITOR 783 -#define IMG_CUSTOM_22 784 -#define IMG_CUSTOM_22_EDITOR 785 -#define IMG_CUSTOM_23 786 -#define IMG_CUSTOM_23_EDITOR 787 -#define IMG_CUSTOM_24 788 -#define IMG_CUSTOM_24_EDITOR 789 -#define IMG_CUSTOM_25 790 -#define IMG_CUSTOM_25_EDITOR 791 -#define IMG_CUSTOM_26 792 -#define IMG_CUSTOM_26_EDITOR 793 -#define IMG_CUSTOM_27 794 -#define IMG_CUSTOM_27_EDITOR 795 -#define IMG_CUSTOM_28 796 -#define IMG_CUSTOM_28_EDITOR 797 -#define IMG_CUSTOM_29 798 -#define IMG_CUSTOM_29_EDITOR 799 -#define IMG_CUSTOM_30 800 -#define IMG_CUSTOM_30_EDITOR 801 -#define IMG_CUSTOM_31 802 -#define IMG_CUSTOM_31_EDITOR 803 -#define IMG_CUSTOM_32 804 -#define IMG_CUSTOM_32_EDITOR 805 -#define IMG_CUSTOM_33 806 -#define IMG_CUSTOM_33_EDITOR 807 -#define IMG_CUSTOM_34 808 -#define IMG_CUSTOM_34_EDITOR 809 -#define IMG_CUSTOM_35 810 -#define IMG_CUSTOM_35_EDITOR 811 -#define IMG_CUSTOM_36 812 -#define IMG_CUSTOM_36_EDITOR 813 -#define IMG_CUSTOM_37 814 -#define IMG_CUSTOM_37_EDITOR 815 -#define IMG_CUSTOM_38 816 -#define IMG_CUSTOM_38_EDITOR 817 -#define IMG_CUSTOM_39 818 -#define IMG_CUSTOM_39_EDITOR 819 -#define IMG_CUSTOM_40 820 -#define IMG_CUSTOM_40_EDITOR 821 -#define IMG_CUSTOM_41 822 -#define IMG_CUSTOM_41_EDITOR 823 -#define IMG_CUSTOM_42 824 -#define IMG_CUSTOM_42_EDITOR 825 -#define IMG_CUSTOM_43 826 -#define IMG_CUSTOM_43_EDITOR 827 -#define IMG_CUSTOM_44 828 -#define IMG_CUSTOM_44_EDITOR 829 -#define IMG_CUSTOM_45 830 -#define IMG_CUSTOM_45_EDITOR 831 -#define IMG_CUSTOM_46 832 -#define IMG_CUSTOM_46_EDITOR 833 -#define IMG_CUSTOM_47 834 -#define IMG_CUSTOM_47_EDITOR 835 -#define IMG_CUSTOM_48 836 -#define IMG_CUSTOM_48_EDITOR 837 -#define IMG_CUSTOM_49 838 -#define IMG_CUSTOM_49_EDITOR 839 -#define IMG_CUSTOM_50 840 -#define IMG_CUSTOM_50_EDITOR 841 -#define IMG_CUSTOM_51 842 -#define IMG_CUSTOM_51_EDITOR 843 -#define IMG_CUSTOM_52 844 -#define IMG_CUSTOM_52_EDITOR 845 -#define IMG_CUSTOM_53 846 -#define IMG_CUSTOM_53_EDITOR 847 -#define IMG_CUSTOM_54 848 -#define IMG_CUSTOM_54_EDITOR 849 -#define IMG_CUSTOM_55 850 -#define IMG_CUSTOM_55_EDITOR 851 -#define IMG_CUSTOM_56 852 -#define IMG_CUSTOM_56_EDITOR 853 -#define IMG_CUSTOM_57 854 -#define IMG_CUSTOM_57_EDITOR 855 -#define IMG_CUSTOM_58 856 -#define IMG_CUSTOM_58_EDITOR 857 -#define IMG_CUSTOM_59 858 -#define IMG_CUSTOM_59_EDITOR 859 -#define IMG_CUSTOM_60 860 -#define IMG_CUSTOM_60_EDITOR 861 -#define IMG_CUSTOM_61 862 -#define IMG_CUSTOM_61_EDITOR 863 -#define IMG_CUSTOM_62 864 -#define IMG_CUSTOM_62_EDITOR 865 -#define IMG_CUSTOM_63 866 -#define IMG_CUSTOM_63_EDITOR 867 -#define IMG_CUSTOM_64 868 -#define IMG_CUSTOM_64_EDITOR 869 -#define IMG_CUSTOM_65 870 -#define IMG_CUSTOM_65_EDITOR 871 -#define IMG_CUSTOM_66 872 -#define IMG_CUSTOM_66_EDITOR 873 -#define IMG_CUSTOM_67 874 -#define IMG_CUSTOM_67_EDITOR 875 -#define IMG_CUSTOM_68 876 -#define IMG_CUSTOM_68_EDITOR 877 -#define IMG_CUSTOM_69 878 -#define IMG_CUSTOM_69_EDITOR 879 -#define IMG_CUSTOM_70 880 -#define IMG_CUSTOM_70_EDITOR 881 -#define IMG_CUSTOM_71 882 -#define IMG_CUSTOM_71_EDITOR 883 -#define IMG_CUSTOM_72 884 -#define IMG_CUSTOM_72_EDITOR 885 -#define IMG_CUSTOM_73 886 -#define IMG_CUSTOM_73_EDITOR 887 -#define IMG_CUSTOM_74 888 -#define IMG_CUSTOM_74_EDITOR 889 -#define IMG_CUSTOM_75 890 -#define IMG_CUSTOM_75_EDITOR 891 -#define IMG_CUSTOM_76 892 -#define IMG_CUSTOM_76_EDITOR 893 -#define IMG_CUSTOM_77 894 -#define IMG_CUSTOM_77_EDITOR 895 -#define IMG_CUSTOM_78 896 -#define IMG_CUSTOM_78_EDITOR 897 -#define IMG_CUSTOM_79 898 -#define IMG_CUSTOM_79_EDITOR 899 -#define IMG_CUSTOM_80 900 -#define IMG_CUSTOM_80_EDITOR 901 -#define IMG_CUSTOM_81 902 -#define IMG_CUSTOM_81_EDITOR 903 -#define IMG_CUSTOM_82 904 -#define IMG_CUSTOM_82_EDITOR 905 -#define IMG_CUSTOM_83 906 -#define IMG_CUSTOM_83_EDITOR 907 -#define IMG_CUSTOM_84 908 -#define IMG_CUSTOM_84_EDITOR 909 -#define IMG_CUSTOM_85 910 -#define IMG_CUSTOM_85_EDITOR 911 -#define IMG_CUSTOM_86 912 -#define IMG_CUSTOM_86_EDITOR 913 -#define IMG_CUSTOM_87 914 -#define IMG_CUSTOM_87_EDITOR 915 -#define IMG_CUSTOM_88 916 -#define IMG_CUSTOM_88_EDITOR 917 -#define IMG_CUSTOM_89 918 -#define IMG_CUSTOM_89_EDITOR 919 -#define IMG_CUSTOM_90 920 -#define IMG_CUSTOM_90_EDITOR 921 -#define IMG_CUSTOM_91 922 -#define IMG_CUSTOM_91_EDITOR 923 -#define IMG_CUSTOM_92 924 -#define IMG_CUSTOM_92_EDITOR 925 -#define IMG_CUSTOM_93 926 -#define IMG_CUSTOM_93_EDITOR 927 -#define IMG_CUSTOM_94 928 -#define IMG_CUSTOM_94_EDITOR 929 -#define IMG_CUSTOM_95 930 -#define IMG_CUSTOM_95_EDITOR 931 -#define IMG_CUSTOM_96 932 -#define IMG_CUSTOM_96_EDITOR 933 -#define IMG_CUSTOM_97 934 -#define IMG_CUSTOM_97_EDITOR 935 -#define IMG_CUSTOM_98 936 -#define IMG_CUSTOM_98_EDITOR 937 -#define IMG_CUSTOM_99 938 -#define IMG_CUSTOM_99_EDITOR 939 -#define IMG_CUSTOM_100 940 -#define IMG_CUSTOM_100_EDITOR 941 -#define IMG_CUSTOM_101 942 -#define IMG_CUSTOM_101_EDITOR 943 -#define IMG_CUSTOM_102 944 -#define IMG_CUSTOM_102_EDITOR 945 -#define IMG_CUSTOM_103 946 -#define IMG_CUSTOM_103_EDITOR 947 -#define IMG_CUSTOM_104 948 -#define IMG_CUSTOM_104_EDITOR 949 -#define IMG_CUSTOM_105 950 -#define IMG_CUSTOM_105_EDITOR 951 -#define IMG_CUSTOM_106 952 -#define IMG_CUSTOM_106_EDITOR 953 -#define IMG_CUSTOM_107 954 -#define IMG_CUSTOM_107_EDITOR 955 -#define IMG_CUSTOM_108 956 -#define IMG_CUSTOM_108_EDITOR 957 -#define IMG_CUSTOM_109 958 -#define IMG_CUSTOM_109_EDITOR 959 -#define IMG_CUSTOM_110 960 -#define IMG_CUSTOM_110_EDITOR 961 -#define IMG_CUSTOM_111 962 -#define IMG_CUSTOM_111_EDITOR 963 -#define IMG_CUSTOM_112 964 -#define IMG_CUSTOM_112_EDITOR 965 -#define IMG_CUSTOM_113 966 -#define IMG_CUSTOM_113_EDITOR 967 -#define IMG_CUSTOM_114 968 -#define IMG_CUSTOM_114_EDITOR 969 -#define IMG_CUSTOM_115 970 -#define IMG_CUSTOM_115_EDITOR 971 -#define IMG_CUSTOM_116 972 -#define IMG_CUSTOM_116_EDITOR 973 -#define IMG_CUSTOM_117 974 -#define IMG_CUSTOM_117_EDITOR 975 -#define IMG_CUSTOM_118 976 -#define IMG_CUSTOM_118_EDITOR 977 -#define IMG_CUSTOM_119 978 -#define IMG_CUSTOM_119_EDITOR 979 -#define IMG_CUSTOM_120 980 -#define IMG_CUSTOM_120_EDITOR 981 -#define IMG_CUSTOM_121 982 -#define IMG_CUSTOM_121_EDITOR 983 -#define IMG_CUSTOM_122 984 -#define IMG_CUSTOM_122_EDITOR 985 -#define IMG_CUSTOM_123 986 -#define IMG_CUSTOM_123_EDITOR 987 -#define IMG_CUSTOM_124 988 -#define IMG_CUSTOM_124_EDITOR 989 -#define IMG_CUSTOM_125 990 -#define IMG_CUSTOM_125_EDITOR 991 -#define IMG_CUSTOM_126 992 -#define IMG_CUSTOM_126_EDITOR 993 -#define IMG_CUSTOM_127 994 -#define IMG_CUSTOM_127_EDITOR 995 -#define IMG_CUSTOM_128 996 -#define IMG_CUSTOM_128_EDITOR 997 -#define IMG_CUSTOM_129 998 -#define IMG_CUSTOM_129_EDITOR 999 -#define IMG_CUSTOM_130 1000 -#define IMG_CUSTOM_130_EDITOR 1001 -#define IMG_CUSTOM_131 1002 -#define IMG_CUSTOM_131_EDITOR 1003 -#define IMG_CUSTOM_132 1004 -#define IMG_CUSTOM_132_EDITOR 1005 -#define IMG_CUSTOM_133 1006 -#define IMG_CUSTOM_133_EDITOR 1007 -#define IMG_CUSTOM_134 1008 -#define IMG_CUSTOM_134_EDITOR 1009 -#define IMG_CUSTOM_135 1010 -#define IMG_CUSTOM_135_EDITOR 1011 -#define IMG_CUSTOM_136 1012 -#define IMG_CUSTOM_136_EDITOR 1013 -#define IMG_CUSTOM_137 1014 -#define IMG_CUSTOM_137_EDITOR 1015 -#define IMG_CUSTOM_138 1016 -#define IMG_CUSTOM_138_EDITOR 1017 -#define IMG_CUSTOM_139 1018 -#define IMG_CUSTOM_139_EDITOR 1019 -#define IMG_CUSTOM_140 1020 -#define IMG_CUSTOM_140_EDITOR 1021 -#define IMG_CUSTOM_141 1022 -#define IMG_CUSTOM_141_EDITOR 1023 -#define IMG_CUSTOM_142 1024 -#define IMG_CUSTOM_142_EDITOR 1025 -#define IMG_CUSTOM_143 1026 -#define IMG_CUSTOM_143_EDITOR 1027 -#define IMG_CUSTOM_144 1028 -#define IMG_CUSTOM_144_EDITOR 1029 -#define IMG_CUSTOM_145 1030 -#define IMG_CUSTOM_145_EDITOR 1031 -#define IMG_CUSTOM_146 1032 -#define IMG_CUSTOM_146_EDITOR 1033 -#define IMG_CUSTOM_147 1034 -#define IMG_CUSTOM_147_EDITOR 1035 -#define IMG_CUSTOM_148 1036 -#define IMG_CUSTOM_148_EDITOR 1037 -#define IMG_CUSTOM_149 1038 -#define IMG_CUSTOM_149_EDITOR 1039 -#define IMG_CUSTOM_150 1040 -#define IMG_CUSTOM_150_EDITOR 1041 -#define IMG_CUSTOM_151 1042 -#define IMG_CUSTOM_151_EDITOR 1043 -#define IMG_CUSTOM_152 1044 -#define IMG_CUSTOM_152_EDITOR 1045 -#define IMG_CUSTOM_153 1046 -#define IMG_CUSTOM_153_EDITOR 1047 -#define IMG_CUSTOM_154 1048 -#define IMG_CUSTOM_154_EDITOR 1049 -#define IMG_CUSTOM_155 1050 -#define IMG_CUSTOM_155_EDITOR 1051 -#define IMG_CUSTOM_156 1052 -#define IMG_CUSTOM_156_EDITOR 1053 -#define IMG_CUSTOM_157 1054 -#define IMG_CUSTOM_157_EDITOR 1055 -#define IMG_CUSTOM_158 1056 -#define IMG_CUSTOM_158_EDITOR 1057 -#define IMG_CUSTOM_159 1058 -#define IMG_CUSTOM_159_EDITOR 1059 -#define IMG_CUSTOM_160 1060 -#define IMG_CUSTOM_160_EDITOR 1061 -#define IMG_CUSTOM_161 1062 -#define IMG_CUSTOM_161_EDITOR 1063 -#define IMG_CUSTOM_162 1064 -#define IMG_CUSTOM_162_EDITOR 1065 -#define IMG_CUSTOM_163 1066 -#define IMG_CUSTOM_163_EDITOR 1067 -#define IMG_CUSTOM_164 1068 -#define IMG_CUSTOM_164_EDITOR 1069 -#define IMG_CUSTOM_165 1070 -#define IMG_CUSTOM_165_EDITOR 1071 -#define IMG_CUSTOM_166 1072 -#define IMG_CUSTOM_166_EDITOR 1073 -#define IMG_CUSTOM_167 1074 -#define IMG_CUSTOM_167_EDITOR 1075 -#define IMG_CUSTOM_168 1076 -#define IMG_CUSTOM_168_EDITOR 1077 -#define IMG_CUSTOM_169 1078 -#define IMG_CUSTOM_169_EDITOR 1079 -#define IMG_CUSTOM_170 1080 -#define IMG_CUSTOM_170_EDITOR 1081 -#define IMG_CUSTOM_171 1082 -#define IMG_CUSTOM_171_EDITOR 1083 -#define IMG_CUSTOM_172 1084 -#define IMG_CUSTOM_172_EDITOR 1085 -#define IMG_CUSTOM_173 1086 -#define IMG_CUSTOM_173_EDITOR 1087 -#define IMG_CUSTOM_174 1088 -#define IMG_CUSTOM_174_EDITOR 1089 -#define IMG_CUSTOM_175 1090 -#define IMG_CUSTOM_175_EDITOR 1091 -#define IMG_CUSTOM_176 1092 -#define IMG_CUSTOM_176_EDITOR 1093 -#define IMG_CUSTOM_177 1094 -#define IMG_CUSTOM_177_EDITOR 1095 -#define IMG_CUSTOM_178 1096 -#define IMG_CUSTOM_178_EDITOR 1097 -#define IMG_CUSTOM_179 1098 -#define IMG_CUSTOM_179_EDITOR 1099 -#define IMG_CUSTOM_180 1100 -#define IMG_CUSTOM_180_EDITOR 1101 -#define IMG_CUSTOM_181 1102 -#define IMG_CUSTOM_181_EDITOR 1103 -#define IMG_CUSTOM_182 1104 -#define IMG_CUSTOM_182_EDITOR 1105 -#define IMG_CUSTOM_183 1106 -#define IMG_CUSTOM_183_EDITOR 1107 -#define IMG_CUSTOM_184 1108 -#define IMG_CUSTOM_184_EDITOR 1109 -#define IMG_CUSTOM_185 1110 -#define IMG_CUSTOM_185_EDITOR 1111 -#define IMG_CUSTOM_186 1112 -#define IMG_CUSTOM_186_EDITOR 1113 -#define IMG_CUSTOM_187 1114 -#define IMG_CUSTOM_187_EDITOR 1115 -#define IMG_CUSTOM_188 1116 -#define IMG_CUSTOM_188_EDITOR 1117 -#define IMG_CUSTOM_189 1118 -#define IMG_CUSTOM_189_EDITOR 1119 -#define IMG_CUSTOM_190 1120 -#define IMG_CUSTOM_190_EDITOR 1121 -#define IMG_CUSTOM_191 1122 -#define IMG_CUSTOM_191_EDITOR 1123 -#define IMG_CUSTOM_192 1124 -#define IMG_CUSTOM_192_EDITOR 1125 -#define IMG_CUSTOM_193 1126 -#define IMG_CUSTOM_193_EDITOR 1127 -#define IMG_CUSTOM_194 1128 -#define IMG_CUSTOM_194_EDITOR 1129 -#define IMG_CUSTOM_195 1130 -#define IMG_CUSTOM_195_EDITOR 1131 -#define IMG_CUSTOM_196 1132 -#define IMG_CUSTOM_196_EDITOR 1133 -#define IMG_CUSTOM_197 1134 -#define IMG_CUSTOM_197_EDITOR 1135 -#define IMG_CUSTOM_198 1136 -#define IMG_CUSTOM_198_EDITOR 1137 -#define IMG_CUSTOM_199 1138 -#define IMG_CUSTOM_199_EDITOR 1139 -#define IMG_CUSTOM_200 1140 -#define IMG_CUSTOM_200_EDITOR 1141 -#define IMG_CUSTOM_201 1142 -#define IMG_CUSTOM_201_EDITOR 1143 -#define IMG_CUSTOM_202 1144 -#define IMG_CUSTOM_202_EDITOR 1145 -#define IMG_CUSTOM_203 1146 -#define IMG_CUSTOM_203_EDITOR 1147 -#define IMG_CUSTOM_204 1148 -#define IMG_CUSTOM_204_EDITOR 1149 -#define IMG_CUSTOM_205 1150 -#define IMG_CUSTOM_205_EDITOR 1151 -#define IMG_CUSTOM_206 1152 -#define IMG_CUSTOM_206_EDITOR 1153 -#define IMG_CUSTOM_207 1154 -#define IMG_CUSTOM_207_EDITOR 1155 -#define IMG_CUSTOM_208 1156 -#define IMG_CUSTOM_208_EDITOR 1157 -#define IMG_CUSTOM_209 1158 -#define IMG_CUSTOM_209_EDITOR 1159 -#define IMG_CUSTOM_210 1160 -#define IMG_CUSTOM_210_EDITOR 1161 -#define IMG_CUSTOM_211 1162 -#define IMG_CUSTOM_211_EDITOR 1163 -#define IMG_CUSTOM_212 1164 -#define IMG_CUSTOM_212_EDITOR 1165 -#define IMG_CUSTOM_213 1166 -#define IMG_CUSTOM_213_EDITOR 1167 -#define IMG_CUSTOM_214 1168 -#define IMG_CUSTOM_214_EDITOR 1169 -#define IMG_CUSTOM_215 1170 -#define IMG_CUSTOM_215_EDITOR 1171 -#define IMG_CUSTOM_216 1172 -#define IMG_CUSTOM_216_EDITOR 1173 -#define IMG_CUSTOM_217 1174 -#define IMG_CUSTOM_217_EDITOR 1175 -#define IMG_CUSTOM_218 1176 -#define IMG_CUSTOM_218_EDITOR 1177 -#define IMG_CUSTOM_219 1178 -#define IMG_CUSTOM_219_EDITOR 1179 -#define IMG_CUSTOM_220 1180 -#define IMG_CUSTOM_220_EDITOR 1181 -#define IMG_CUSTOM_221 1182 -#define IMG_CUSTOM_221_EDITOR 1183 -#define IMG_CUSTOM_222 1184 -#define IMG_CUSTOM_222_EDITOR 1185 -#define IMG_CUSTOM_223 1186 -#define IMG_CUSTOM_223_EDITOR 1187 -#define IMG_CUSTOM_224 1188 -#define IMG_CUSTOM_224_EDITOR 1189 -#define IMG_CUSTOM_225 1190 -#define IMG_CUSTOM_225_EDITOR 1191 -#define IMG_CUSTOM_226 1192 -#define IMG_CUSTOM_226_EDITOR 1193 -#define IMG_CUSTOM_227 1194 -#define IMG_CUSTOM_227_EDITOR 1195 -#define IMG_CUSTOM_228 1196 -#define IMG_CUSTOM_228_EDITOR 1197 -#define IMG_CUSTOM_229 1198 -#define IMG_CUSTOM_229_EDITOR 1199 -#define IMG_CUSTOM_230 1200 -#define IMG_CUSTOM_230_EDITOR 1201 -#define IMG_CUSTOM_231 1202 -#define IMG_CUSTOM_231_EDITOR 1203 -#define IMG_CUSTOM_232 1204 -#define IMG_CUSTOM_232_EDITOR 1205 -#define IMG_CUSTOM_233 1206 -#define IMG_CUSTOM_233_EDITOR 1207 -#define IMG_CUSTOM_234 1208 -#define IMG_CUSTOM_234_EDITOR 1209 -#define IMG_CUSTOM_235 1210 -#define IMG_CUSTOM_235_EDITOR 1211 -#define IMG_CUSTOM_236 1212 -#define IMG_CUSTOM_236_EDITOR 1213 -#define IMG_CUSTOM_237 1214 -#define IMG_CUSTOM_237_EDITOR 1215 -#define IMG_CUSTOM_238 1216 -#define IMG_CUSTOM_238_EDITOR 1217 -#define IMG_CUSTOM_239 1218 -#define IMG_CUSTOM_239_EDITOR 1219 -#define IMG_CUSTOM_240 1220 -#define IMG_CUSTOM_240_EDITOR 1221 -#define IMG_CUSTOM_241 1222 -#define IMG_CUSTOM_241_EDITOR 1223 -#define IMG_CUSTOM_242 1224 -#define IMG_CUSTOM_242_EDITOR 1225 -#define IMG_CUSTOM_243 1226 -#define IMG_CUSTOM_243_EDITOR 1227 -#define IMG_CUSTOM_244 1228 -#define IMG_CUSTOM_244_EDITOR 1229 -#define IMG_CUSTOM_245 1230 -#define IMG_CUSTOM_245_EDITOR 1231 -#define IMG_CUSTOM_246 1232 -#define IMG_CUSTOM_246_EDITOR 1233 -#define IMG_CUSTOM_247 1234 -#define IMG_CUSTOM_247_EDITOR 1235 -#define IMG_CUSTOM_248 1236 -#define IMG_CUSTOM_248_EDITOR 1237 -#define IMG_CUSTOM_249 1238 -#define IMG_CUSTOM_249_EDITOR 1239 -#define IMG_CUSTOM_250 1240 -#define IMG_CUSTOM_250_EDITOR 1241 -#define IMG_CUSTOM_251 1242 -#define IMG_CUSTOM_251_EDITOR 1243 -#define IMG_CUSTOM_252 1244 -#define IMG_CUSTOM_252_EDITOR 1245 -#define IMG_CUSTOM_253 1246 -#define IMG_CUSTOM_253_EDITOR 1247 -#define IMG_CUSTOM_254 1248 -#define IMG_CUSTOM_254_EDITOR 1249 -#define IMG_CUSTOM_255 1250 -#define IMG_CUSTOM_255_EDITOR 1251 -#define IMG_CUSTOM_256 1252 -#define IMG_CUSTOM_256_EDITOR 1253 -#define IMG_GROUP_1 1254 -#define IMG_GROUP_1_EDITOR 1255 -#define IMG_GROUP_2 1256 -#define IMG_GROUP_2_EDITOR 1257 -#define IMG_GROUP_3 1258 -#define IMG_GROUP_3_EDITOR 1259 -#define IMG_GROUP_4 1260 -#define IMG_GROUP_4_EDITOR 1261 -#define IMG_GROUP_5 1262 -#define IMG_GROUP_5_EDITOR 1263 -#define IMG_GROUP_6 1264 -#define IMG_GROUP_6_EDITOR 1265 -#define IMG_GROUP_7 1266 -#define IMG_GROUP_7_EDITOR 1267 -#define IMG_GROUP_8 1268 -#define IMG_GROUP_8_EDITOR 1269 -#define IMG_GROUP_9 1270 -#define IMG_GROUP_9_EDITOR 1271 -#define IMG_GROUP_10 1272 -#define IMG_GROUP_10_EDITOR 1273 -#define IMG_GROUP_11 1274 -#define IMG_GROUP_11_EDITOR 1275 -#define IMG_GROUP_12 1276 -#define IMG_GROUP_12_EDITOR 1277 -#define IMG_GROUP_13 1278 -#define IMG_GROUP_13_EDITOR 1279 -#define IMG_GROUP_14 1280 -#define IMG_GROUP_14_EDITOR 1281 -#define IMG_GROUP_15 1282 -#define IMG_GROUP_15_EDITOR 1283 -#define IMG_GROUP_16 1284 -#define IMG_GROUP_16_EDITOR 1285 -#define IMG_GROUP_17 1286 -#define IMG_GROUP_17_EDITOR 1287 -#define IMG_GROUP_18 1288 -#define IMG_GROUP_18_EDITOR 1289 -#define IMG_GROUP_19 1290 -#define IMG_GROUP_19_EDITOR 1291 -#define IMG_GROUP_20 1292 -#define IMG_GROUP_20_EDITOR 1293 -#define IMG_GROUP_21 1294 -#define IMG_GROUP_21_EDITOR 1295 -#define IMG_GROUP_22 1296 -#define IMG_GROUP_22_EDITOR 1297 -#define IMG_GROUP_23 1298 -#define IMG_GROUP_23_EDITOR 1299 -#define IMG_GROUP_24 1300 -#define IMG_GROUP_24_EDITOR 1301 -#define IMG_GROUP_25 1302 -#define IMG_GROUP_25_EDITOR 1303 -#define IMG_GROUP_26 1304 -#define IMG_GROUP_26_EDITOR 1305 -#define IMG_GROUP_27 1306 -#define IMG_GROUP_27_EDITOR 1307 -#define IMG_GROUP_28 1308 -#define IMG_GROUP_28_EDITOR 1309 -#define IMG_GROUP_29 1310 -#define IMG_GROUP_29_EDITOR 1311 -#define IMG_GROUP_30 1312 -#define IMG_GROUP_30_EDITOR 1313 -#define IMG_GROUP_31 1314 -#define IMG_GROUP_31_EDITOR 1315 -#define IMG_GROUP_32 1316 -#define IMG_GROUP_32_EDITOR 1317 -#define IMG_EMC_OBJECT 1318 -#define IMG_EMC_SPRITE 1319 -#define IMG_TOON_1 1320 -#define IMG_TOON_2 1321 -#define IMG_TOON_3 1322 -#define IMG_TOON_4 1323 -#define IMG_TOON_5 1324 -#define IMG_TOON_6 1325 -#define IMG_TOON_7 1326 -#define IMG_TOON_8 1327 -#define IMG_TOON_9 1328 -#define IMG_TOON_10 1329 -#define IMG_TOON_11 1330 -#define IMG_TOON_12 1331 -#define IMG_TOON_13 1332 -#define IMG_TOON_14 1333 -#define IMG_TOON_15 1334 -#define IMG_TOON_16 1335 -#define IMG_TOON_17 1336 -#define IMG_TOON_18 1337 -#define IMG_TOON_19 1338 -#define IMG_TOON_20 1339 -#define IMG_MENU_CALIBRATE_RED 1340 -#define IMG_MENU_CALIBRATE_BLUE 1341 -#define IMG_MENU_CALIBRATE_YELLOW 1342 -#define IMG_MENU_BUTTON 1343 -#define IMG_MENU_BUTTON_ACTIVE 1344 -#define IMG_MENU_BUTTON_LEFT 1345 -#define IMG_MENU_BUTTON_RIGHT 1346 -#define IMG_MENU_BUTTON_UP 1347 -#define IMG_MENU_BUTTON_DOWN 1348 -#define IMG_MENU_BUTTON_LEFT_ACTIVE 1349 -#define IMG_MENU_BUTTON_RIGHT_ACTIVE 1350 -#define IMG_MENU_BUTTON_UP_ACTIVE 1351 -#define IMG_MENU_BUTTON_DOWN_ACTIVE 1352 -#define IMG_MENU_SCROLLBAR 1353 -#define IMG_MENU_SCROLLBAR_ACTIVE 1354 -#define IMG_FONT_INITIAL_1 1355 -#define IMG_FONT_INITIAL_2 1356 -#define IMG_FONT_INITIAL_3 1357 -#define IMG_FONT_INITIAL_4 1358 -#define IMG_FONT_TITLE_1 1359 -#define IMG_FONT_TITLE_1_LEVELS 1360 -#define IMG_FONT_TITLE_2 1361 -#define IMG_FONT_MENU_1 1362 -#define IMG_FONT_MENU_2 1363 -#define IMG_FONT_TEXT_1 1364 -#define IMG_FONT_TEXT_1_LEVELS 1365 -#define IMG_FONT_TEXT_1_PREVIEW 1366 -#define IMG_FONT_TEXT_1_SCORES 1367 -#define IMG_FONT_TEXT_1_ACTIVE_SCORES 1368 -#define IMG_FONT_TEXT_2 1369 -#define IMG_FONT_TEXT_2_LEVELS 1370 -#define IMG_FONT_TEXT_2_PREVIEW 1371 -#define IMG_FONT_TEXT_2_SCORES 1372 -#define IMG_FONT_TEXT_2_ACTIVE_SCORES 1373 -#define IMG_FONT_TEXT_3 1374 -#define IMG_FONT_TEXT_3_LEVELS 1375 -#define IMG_FONT_TEXT_3_PREVIEW 1376 -#define IMG_FONT_TEXT_3_SCORES 1377 -#define IMG_FONT_TEXT_3_ACTIVE_SCORES 1378 -#define IMG_FONT_TEXT_4 1379 -#define IMG_FONT_TEXT_4_LEVELS 1380 -#define IMG_FONT_TEXT_4_SCORES 1381 -#define IMG_FONT_TEXT_4_ACTIVE_SCORES 1382 -#define IMG_FONT_ENVELOPE_1 1383 -#define IMG_FONT_ENVELOPE_2 1384 -#define IMG_FONT_ENVELOPE_3 1385 -#define IMG_FONT_ENVELOPE_4 1386 -#define IMG_FONT_INPUT_1 1387 -#define IMG_FONT_INPUT_1_MAIN 1388 -#define IMG_FONT_INPUT_1_ACTIVE 1389 -#define IMG_FONT_INPUT_1_ACTIVE_MAIN 1390 -#define IMG_FONT_INPUT_1_ACTIVE_SETUP 1391 -#define IMG_FONT_INPUT_2 1392 -#define IMG_FONT_INPUT_2_ACTIVE 1393 -#define IMG_FONT_OPTION_OFF 1394 -#define IMG_FONT_OPTION_ON 1395 -#define IMG_FONT_VALUE_1 1396 -#define IMG_FONT_VALUE_2 1397 -#define IMG_FONT_VALUE_OLD 1398 -#define IMG_FONT_LEVEL_NUMBER 1399 -#define IMG_FONT_TAPE_RECORDER 1400 -#define IMG_FONT_GAME_INFO 1401 -#define IMG_GLOBAL_BORDER 1402 -#define IMG_GLOBAL_DOOR 1403 -#define IMG_EDITOR_ELEMENT_BORDER 1404 -#define IMG_EDITOR_ELEMENT_BORDER_INPUT 1405 -#define IMG_BACKGROUND_ENVELOPE_1 1406 -#define IMG_BACKGROUND_ENVELOPE_2 1407 -#define IMG_BACKGROUND_ENVELOPE_3 1408 -#define IMG_BACKGROUND_ENVELOPE_4 1409 -#define IMG_BACKGROUND 1410 -#define IMG_BACKGROUND_MAIN 1411 -#define IMG_BACKGROUND_LEVELS 1412 -#define IMG_BACKGROUND_SCORES 1413 -#define IMG_BACKGROUND_EDITOR 1414 -#define IMG_BACKGROUND_INFO 1415 -#define IMG_BACKGROUND_INFO_ELEMENTS 1416 -#define IMG_BACKGROUND_SETUP 1417 -#define IMG_BACKGROUND_DOOR 1418 +#define IMG_EMC_GRASS 658 +#define IMG_EMC_MAGIC_BALL 659 +#define IMG_EMC_MAGIC_BALL_SWITCH 660 +#define IMG_EMC_GATE_5 661 +#define IMG_EMC_GATE_5_GRAY 662 +#define IMG_EMC_GATE_6 663 +#define IMG_EMC_GATE_6_GRAY 664 +#define IMG_EMC_GATE_7 665 +#define IMG_EMC_GATE_7_GRAY 666 +#define IMG_EMC_GATE_8 667 +#define IMG_EMC_GATE_8_GRAY 668 +#define IMG_EMC_KEY_5 669 +#define IMG_EMC_KEY_6 670 +#define IMG_EMC_KEY_7 671 +#define IMG_EMC_KEY_8 672 +#define IMG_EMC_BUMPER 673 +#define IMG_EMC_PLANT 674 +#define IMG_EMC_LENSES 675 +#define IMG_EMC_MAGNIFIER 676 +#define IMG_EMC_WALL_9 677 +#define IMG_EMC_WALL_10 678 +#define IMG_EMC_WALL_11 679 +#define IMG_EMC_WALL_12 680 +#define IMG_EMC_WALL_13 681 +#define IMG_EMC_WALL_14 682 +#define IMG_EMC_WALL_15 683 +#define IMG_EMC_WALL_16 684 +#define IMG_EMC_WALL_SLIPPERY_1 685 +#define IMG_EMC_WALL_SLIPPERY_2 686 +#define IMG_EMC_WALL_SLIPPERY_3 687 +#define IMG_EMC_WALL_SLIPPERY_4 688 +#define IMG_CHAR_SPACE 689 +#define IMG_CHAR_EXCLAM 690 +#define IMG_CHAR_QUOTEDBL 691 +#define IMG_CHAR_NUMBERSIGN 692 +#define IMG_CHAR_DOLLAR 693 +#define IMG_CHAR_PROCENT 694 +#define IMG_CHAR_AMPERSAND 695 +#define IMG_CHAR_APOSTROPHE 696 +#define IMG_CHAR_PARENLEFT 697 +#define IMG_CHAR_PARENRIGHT 698 +#define IMG_CHAR_ASTERISK 699 +#define IMG_CHAR_PLUS 700 +#define IMG_CHAR_COMMA 701 +#define IMG_CHAR_MINUS 702 +#define IMG_CHAR_PERIOD 703 +#define IMG_CHAR_SLASH 704 +#define IMG_CHAR_0 705 +#define IMG_CHAR_1 706 +#define IMG_CHAR_2 707 +#define IMG_CHAR_3 708 +#define IMG_CHAR_4 709 +#define IMG_CHAR_5 710 +#define IMG_CHAR_6 711 +#define IMG_CHAR_7 712 +#define IMG_CHAR_8 713 +#define IMG_CHAR_9 714 +#define IMG_CHAR_COLON 715 +#define IMG_CHAR_SEMICOLON 716 +#define IMG_CHAR_LESS 717 +#define IMG_CHAR_EQUAL 718 +#define IMG_CHAR_GREATER 719 +#define IMG_CHAR_QUESTION 720 +#define IMG_CHAR_AT 721 +#define IMG_CHAR_A 722 +#define IMG_CHAR_B 723 +#define IMG_CHAR_C 724 +#define IMG_CHAR_D 725 +#define IMG_CHAR_E 726 +#define IMG_CHAR_F 727 +#define IMG_CHAR_G 728 +#define IMG_CHAR_H 729 +#define IMG_CHAR_I 730 +#define IMG_CHAR_J 731 +#define IMG_CHAR_K 732 +#define IMG_CHAR_L 733 +#define IMG_CHAR_M 734 +#define IMG_CHAR_N 735 +#define IMG_CHAR_O 736 +#define IMG_CHAR_P 737 +#define IMG_CHAR_Q 738 +#define IMG_CHAR_R 739 +#define IMG_CHAR_S 740 +#define IMG_CHAR_T 741 +#define IMG_CHAR_U 742 +#define IMG_CHAR_V 743 +#define IMG_CHAR_W 744 +#define IMG_CHAR_X 745 +#define IMG_CHAR_Y 746 +#define IMG_CHAR_Z 747 +#define IMG_CHAR_BRACKETLEFT 748 +#define IMG_CHAR_BACKSLASH 749 +#define IMG_CHAR_BRACKETRIGHT 750 +#define IMG_CHAR_ASCIICIRCUM 751 +#define IMG_CHAR_UNDERSCORE 752 +#define IMG_CHAR_COPYRIGHT 753 +#define IMG_CHAR_AUMLAUT 754 +#define IMG_CHAR_OUMLAUT 755 +#define IMG_CHAR_UUMLAUT 756 +#define IMG_CHAR_DEGREE 757 +#define IMG_CHAR_TRADEMARK 758 +#define IMG_CHAR_CURSOR 759 +#define IMG_CUSTOM_1 760 +#define IMG_CUSTOM_1_EDITOR 761 +#define IMG_CUSTOM_2 762 +#define IMG_CUSTOM_2_EDITOR 763 +#define IMG_CUSTOM_3 764 +#define IMG_CUSTOM_3_EDITOR 765 +#define IMG_CUSTOM_4 766 +#define IMG_CUSTOM_4_EDITOR 767 +#define IMG_CUSTOM_5 768 +#define IMG_CUSTOM_5_EDITOR 769 +#define IMG_CUSTOM_6 770 +#define IMG_CUSTOM_6_EDITOR 771 +#define IMG_CUSTOM_7 772 +#define IMG_CUSTOM_7_EDITOR 773 +#define IMG_CUSTOM_8 774 +#define IMG_CUSTOM_8_EDITOR 775 +#define IMG_CUSTOM_9 776 +#define IMG_CUSTOM_9_EDITOR 777 +#define IMG_CUSTOM_10 778 +#define IMG_CUSTOM_10_EDITOR 779 +#define IMG_CUSTOM_11 780 +#define IMG_CUSTOM_11_EDITOR 781 +#define IMG_CUSTOM_12 782 +#define IMG_CUSTOM_12_EDITOR 783 +#define IMG_CUSTOM_13 784 +#define IMG_CUSTOM_13_EDITOR 785 +#define IMG_CUSTOM_14 786 +#define IMG_CUSTOM_14_EDITOR 787 +#define IMG_CUSTOM_15 788 +#define IMG_CUSTOM_15_EDITOR 789 +#define IMG_CUSTOM_16 790 +#define IMG_CUSTOM_16_EDITOR 791 +#define IMG_CUSTOM_17 792 +#define IMG_CUSTOM_17_EDITOR 793 +#define IMG_CUSTOM_18 794 +#define IMG_CUSTOM_18_EDITOR 795 +#define IMG_CUSTOM_19 796 +#define IMG_CUSTOM_19_EDITOR 797 +#define IMG_CUSTOM_20 798 +#define IMG_CUSTOM_20_EDITOR 799 +#define IMG_CUSTOM_21 800 +#define IMG_CUSTOM_21_EDITOR 801 +#define IMG_CUSTOM_22 802 +#define IMG_CUSTOM_22_EDITOR 803 +#define IMG_CUSTOM_23 804 +#define IMG_CUSTOM_23_EDITOR 805 +#define IMG_CUSTOM_24 806 +#define IMG_CUSTOM_24_EDITOR 807 +#define IMG_CUSTOM_25 808 +#define IMG_CUSTOM_25_EDITOR 809 +#define IMG_CUSTOM_26 810 +#define IMG_CUSTOM_26_EDITOR 811 +#define IMG_CUSTOM_27 812 +#define IMG_CUSTOM_27_EDITOR 813 +#define IMG_CUSTOM_28 814 +#define IMG_CUSTOM_28_EDITOR 815 +#define IMG_CUSTOM_29 816 +#define IMG_CUSTOM_29_EDITOR 817 +#define IMG_CUSTOM_30 818 +#define IMG_CUSTOM_30_EDITOR 819 +#define IMG_CUSTOM_31 820 +#define IMG_CUSTOM_31_EDITOR 821 +#define IMG_CUSTOM_32 822 +#define IMG_CUSTOM_32_EDITOR 823 +#define IMG_CUSTOM_33 824 +#define IMG_CUSTOM_33_EDITOR 825 +#define IMG_CUSTOM_34 826 +#define IMG_CUSTOM_34_EDITOR 827 +#define IMG_CUSTOM_35 828 +#define IMG_CUSTOM_35_EDITOR 829 +#define IMG_CUSTOM_36 830 +#define IMG_CUSTOM_36_EDITOR 831 +#define IMG_CUSTOM_37 832 +#define IMG_CUSTOM_37_EDITOR 833 +#define IMG_CUSTOM_38 834 +#define IMG_CUSTOM_38_EDITOR 835 +#define IMG_CUSTOM_39 836 +#define IMG_CUSTOM_39_EDITOR 837 +#define IMG_CUSTOM_40 838 +#define IMG_CUSTOM_40_EDITOR 839 +#define IMG_CUSTOM_41 840 +#define IMG_CUSTOM_41_EDITOR 841 +#define IMG_CUSTOM_42 842 +#define IMG_CUSTOM_42_EDITOR 843 +#define IMG_CUSTOM_43 844 +#define IMG_CUSTOM_43_EDITOR 845 +#define IMG_CUSTOM_44 846 +#define IMG_CUSTOM_44_EDITOR 847 +#define IMG_CUSTOM_45 848 +#define IMG_CUSTOM_45_EDITOR 849 +#define IMG_CUSTOM_46 850 +#define IMG_CUSTOM_46_EDITOR 851 +#define IMG_CUSTOM_47 852 +#define IMG_CUSTOM_47_EDITOR 853 +#define IMG_CUSTOM_48 854 +#define IMG_CUSTOM_48_EDITOR 855 +#define IMG_CUSTOM_49 856 +#define IMG_CUSTOM_49_EDITOR 857 +#define IMG_CUSTOM_50 858 +#define IMG_CUSTOM_50_EDITOR 859 +#define IMG_CUSTOM_51 860 +#define IMG_CUSTOM_51_EDITOR 861 +#define IMG_CUSTOM_52 862 +#define IMG_CUSTOM_52_EDITOR 863 +#define IMG_CUSTOM_53 864 +#define IMG_CUSTOM_53_EDITOR 865 +#define IMG_CUSTOM_54 866 +#define IMG_CUSTOM_54_EDITOR 867 +#define IMG_CUSTOM_55 868 +#define IMG_CUSTOM_55_EDITOR 869 +#define IMG_CUSTOM_56 870 +#define IMG_CUSTOM_56_EDITOR 871 +#define IMG_CUSTOM_57 872 +#define IMG_CUSTOM_57_EDITOR 873 +#define IMG_CUSTOM_58 874 +#define IMG_CUSTOM_58_EDITOR 875 +#define IMG_CUSTOM_59 876 +#define IMG_CUSTOM_59_EDITOR 877 +#define IMG_CUSTOM_60 878 +#define IMG_CUSTOM_60_EDITOR 879 +#define IMG_CUSTOM_61 880 +#define IMG_CUSTOM_61_EDITOR 881 +#define IMG_CUSTOM_62 882 +#define IMG_CUSTOM_62_EDITOR 883 +#define IMG_CUSTOM_63 884 +#define IMG_CUSTOM_63_EDITOR 885 +#define IMG_CUSTOM_64 886 +#define IMG_CUSTOM_64_EDITOR 887 +#define IMG_CUSTOM_65 888 +#define IMG_CUSTOM_65_EDITOR 889 +#define IMG_CUSTOM_66 890 +#define IMG_CUSTOM_66_EDITOR 891 +#define IMG_CUSTOM_67 892 +#define IMG_CUSTOM_67_EDITOR 893 +#define IMG_CUSTOM_68 894 +#define IMG_CUSTOM_68_EDITOR 895 +#define IMG_CUSTOM_69 896 +#define IMG_CUSTOM_69_EDITOR 897 +#define IMG_CUSTOM_70 898 +#define IMG_CUSTOM_70_EDITOR 899 +#define IMG_CUSTOM_71 900 +#define IMG_CUSTOM_71_EDITOR 901 +#define IMG_CUSTOM_72 902 +#define IMG_CUSTOM_72_EDITOR 903 +#define IMG_CUSTOM_73 904 +#define IMG_CUSTOM_73_EDITOR 905 +#define IMG_CUSTOM_74 906 +#define IMG_CUSTOM_74_EDITOR 907 +#define IMG_CUSTOM_75 908 +#define IMG_CUSTOM_75_EDITOR 909 +#define IMG_CUSTOM_76 910 +#define IMG_CUSTOM_76_EDITOR 911 +#define IMG_CUSTOM_77 912 +#define IMG_CUSTOM_77_EDITOR 913 +#define IMG_CUSTOM_78 914 +#define IMG_CUSTOM_78_EDITOR 915 +#define IMG_CUSTOM_79 916 +#define IMG_CUSTOM_79_EDITOR 917 +#define IMG_CUSTOM_80 918 +#define IMG_CUSTOM_80_EDITOR 919 +#define IMG_CUSTOM_81 920 +#define IMG_CUSTOM_81_EDITOR 921 +#define IMG_CUSTOM_82 922 +#define IMG_CUSTOM_82_EDITOR 923 +#define IMG_CUSTOM_83 924 +#define IMG_CUSTOM_83_EDITOR 925 +#define IMG_CUSTOM_84 926 +#define IMG_CUSTOM_84_EDITOR 927 +#define IMG_CUSTOM_85 928 +#define IMG_CUSTOM_85_EDITOR 929 +#define IMG_CUSTOM_86 930 +#define IMG_CUSTOM_86_EDITOR 931 +#define IMG_CUSTOM_87 932 +#define IMG_CUSTOM_87_EDITOR 933 +#define IMG_CUSTOM_88 934 +#define IMG_CUSTOM_88_EDITOR 935 +#define IMG_CUSTOM_89 936 +#define IMG_CUSTOM_89_EDITOR 937 +#define IMG_CUSTOM_90 938 +#define IMG_CUSTOM_90_EDITOR 939 +#define IMG_CUSTOM_91 940 +#define IMG_CUSTOM_91_EDITOR 941 +#define IMG_CUSTOM_92 942 +#define IMG_CUSTOM_92_EDITOR 943 +#define IMG_CUSTOM_93 944 +#define IMG_CUSTOM_93_EDITOR 945 +#define IMG_CUSTOM_94 946 +#define IMG_CUSTOM_94_EDITOR 947 +#define IMG_CUSTOM_95 948 +#define IMG_CUSTOM_95_EDITOR 949 +#define IMG_CUSTOM_96 950 +#define IMG_CUSTOM_96_EDITOR 951 +#define IMG_CUSTOM_97 952 +#define IMG_CUSTOM_97_EDITOR 953 +#define IMG_CUSTOM_98 954 +#define IMG_CUSTOM_98_EDITOR 955 +#define IMG_CUSTOM_99 956 +#define IMG_CUSTOM_99_EDITOR 957 +#define IMG_CUSTOM_100 958 +#define IMG_CUSTOM_100_EDITOR 959 +#define IMG_CUSTOM_101 960 +#define IMG_CUSTOM_101_EDITOR 961 +#define IMG_CUSTOM_102 962 +#define IMG_CUSTOM_102_EDITOR 963 +#define IMG_CUSTOM_103 964 +#define IMG_CUSTOM_103_EDITOR 965 +#define IMG_CUSTOM_104 966 +#define IMG_CUSTOM_104_EDITOR 967 +#define IMG_CUSTOM_105 968 +#define IMG_CUSTOM_105_EDITOR 969 +#define IMG_CUSTOM_106 970 +#define IMG_CUSTOM_106_EDITOR 971 +#define IMG_CUSTOM_107 972 +#define IMG_CUSTOM_107_EDITOR 973 +#define IMG_CUSTOM_108 974 +#define IMG_CUSTOM_108_EDITOR 975 +#define IMG_CUSTOM_109 976 +#define IMG_CUSTOM_109_EDITOR 977 +#define IMG_CUSTOM_110 978 +#define IMG_CUSTOM_110_EDITOR 979 +#define IMG_CUSTOM_111 980 +#define IMG_CUSTOM_111_EDITOR 981 +#define IMG_CUSTOM_112 982 +#define IMG_CUSTOM_112_EDITOR 983 +#define IMG_CUSTOM_113 984 +#define IMG_CUSTOM_113_EDITOR 985 +#define IMG_CUSTOM_114 986 +#define IMG_CUSTOM_114_EDITOR 987 +#define IMG_CUSTOM_115 988 +#define IMG_CUSTOM_115_EDITOR 989 +#define IMG_CUSTOM_116 990 +#define IMG_CUSTOM_116_EDITOR 991 +#define IMG_CUSTOM_117 992 +#define IMG_CUSTOM_117_EDITOR 993 +#define IMG_CUSTOM_118 994 +#define IMG_CUSTOM_118_EDITOR 995 +#define IMG_CUSTOM_119 996 +#define IMG_CUSTOM_119_EDITOR 997 +#define IMG_CUSTOM_120 998 +#define IMG_CUSTOM_120_EDITOR 999 +#define IMG_CUSTOM_121 1000 +#define IMG_CUSTOM_121_EDITOR 1001 +#define IMG_CUSTOM_122 1002 +#define IMG_CUSTOM_122_EDITOR 1003 +#define IMG_CUSTOM_123 1004 +#define IMG_CUSTOM_123_EDITOR 1005 +#define IMG_CUSTOM_124 1006 +#define IMG_CUSTOM_124_EDITOR 1007 +#define IMG_CUSTOM_125 1008 +#define IMG_CUSTOM_125_EDITOR 1009 +#define IMG_CUSTOM_126 1010 +#define IMG_CUSTOM_126_EDITOR 1011 +#define IMG_CUSTOM_127 1012 +#define IMG_CUSTOM_127_EDITOR 1013 +#define IMG_CUSTOM_128 1014 +#define IMG_CUSTOM_128_EDITOR 1015 +#define IMG_CUSTOM_129 1016 +#define IMG_CUSTOM_129_EDITOR 1017 +#define IMG_CUSTOM_130 1018 +#define IMG_CUSTOM_130_EDITOR 1019 +#define IMG_CUSTOM_131 1020 +#define IMG_CUSTOM_131_EDITOR 1021 +#define IMG_CUSTOM_132 1022 +#define IMG_CUSTOM_132_EDITOR 1023 +#define IMG_CUSTOM_133 1024 +#define IMG_CUSTOM_133_EDITOR 1025 +#define IMG_CUSTOM_134 1026 +#define IMG_CUSTOM_134_EDITOR 1027 +#define IMG_CUSTOM_135 1028 +#define IMG_CUSTOM_135_EDITOR 1029 +#define IMG_CUSTOM_136 1030 +#define IMG_CUSTOM_136_EDITOR 1031 +#define IMG_CUSTOM_137 1032 +#define IMG_CUSTOM_137_EDITOR 1033 +#define IMG_CUSTOM_138 1034 +#define IMG_CUSTOM_138_EDITOR 1035 +#define IMG_CUSTOM_139 1036 +#define IMG_CUSTOM_139_EDITOR 1037 +#define IMG_CUSTOM_140 1038 +#define IMG_CUSTOM_140_EDITOR 1039 +#define IMG_CUSTOM_141 1040 +#define IMG_CUSTOM_141_EDITOR 1041 +#define IMG_CUSTOM_142 1042 +#define IMG_CUSTOM_142_EDITOR 1043 +#define IMG_CUSTOM_143 1044 +#define IMG_CUSTOM_143_EDITOR 1045 +#define IMG_CUSTOM_144 1046 +#define IMG_CUSTOM_144_EDITOR 1047 +#define IMG_CUSTOM_145 1048 +#define IMG_CUSTOM_145_EDITOR 1049 +#define IMG_CUSTOM_146 1050 +#define IMG_CUSTOM_146_EDITOR 1051 +#define IMG_CUSTOM_147 1052 +#define IMG_CUSTOM_147_EDITOR 1053 +#define IMG_CUSTOM_148 1054 +#define IMG_CUSTOM_148_EDITOR 1055 +#define IMG_CUSTOM_149 1056 +#define IMG_CUSTOM_149_EDITOR 1057 +#define IMG_CUSTOM_150 1058 +#define IMG_CUSTOM_150_EDITOR 1059 +#define IMG_CUSTOM_151 1060 +#define IMG_CUSTOM_151_EDITOR 1061 +#define IMG_CUSTOM_152 1062 +#define IMG_CUSTOM_152_EDITOR 1063 +#define IMG_CUSTOM_153 1064 +#define IMG_CUSTOM_153_EDITOR 1065 +#define IMG_CUSTOM_154 1066 +#define IMG_CUSTOM_154_EDITOR 1067 +#define IMG_CUSTOM_155 1068 +#define IMG_CUSTOM_155_EDITOR 1069 +#define IMG_CUSTOM_156 1070 +#define IMG_CUSTOM_156_EDITOR 1071 +#define IMG_CUSTOM_157 1072 +#define IMG_CUSTOM_157_EDITOR 1073 +#define IMG_CUSTOM_158 1074 +#define IMG_CUSTOM_158_EDITOR 1075 +#define IMG_CUSTOM_159 1076 +#define IMG_CUSTOM_159_EDITOR 1077 +#define IMG_CUSTOM_160 1078 +#define IMG_CUSTOM_160_EDITOR 1079 +#define IMG_CUSTOM_161 1080 +#define IMG_CUSTOM_161_EDITOR 1081 +#define IMG_CUSTOM_162 1082 +#define IMG_CUSTOM_162_EDITOR 1083 +#define IMG_CUSTOM_163 1084 +#define IMG_CUSTOM_163_EDITOR 1085 +#define IMG_CUSTOM_164 1086 +#define IMG_CUSTOM_164_EDITOR 1087 +#define IMG_CUSTOM_165 1088 +#define IMG_CUSTOM_165_EDITOR 1089 +#define IMG_CUSTOM_166 1090 +#define IMG_CUSTOM_166_EDITOR 1091 +#define IMG_CUSTOM_167 1092 +#define IMG_CUSTOM_167_EDITOR 1093 +#define IMG_CUSTOM_168 1094 +#define IMG_CUSTOM_168_EDITOR 1095 +#define IMG_CUSTOM_169 1096 +#define IMG_CUSTOM_169_EDITOR 1097 +#define IMG_CUSTOM_170 1098 +#define IMG_CUSTOM_170_EDITOR 1099 +#define IMG_CUSTOM_171 1100 +#define IMG_CUSTOM_171_EDITOR 1101 +#define IMG_CUSTOM_172 1102 +#define IMG_CUSTOM_172_EDITOR 1103 +#define IMG_CUSTOM_173 1104 +#define IMG_CUSTOM_173_EDITOR 1105 +#define IMG_CUSTOM_174 1106 +#define IMG_CUSTOM_174_EDITOR 1107 +#define IMG_CUSTOM_175 1108 +#define IMG_CUSTOM_175_EDITOR 1109 +#define IMG_CUSTOM_176 1110 +#define IMG_CUSTOM_176_EDITOR 1111 +#define IMG_CUSTOM_177 1112 +#define IMG_CUSTOM_177_EDITOR 1113 +#define IMG_CUSTOM_178 1114 +#define IMG_CUSTOM_178_EDITOR 1115 +#define IMG_CUSTOM_179 1116 +#define IMG_CUSTOM_179_EDITOR 1117 +#define IMG_CUSTOM_180 1118 +#define IMG_CUSTOM_180_EDITOR 1119 +#define IMG_CUSTOM_181 1120 +#define IMG_CUSTOM_181_EDITOR 1121 +#define IMG_CUSTOM_182 1122 +#define IMG_CUSTOM_182_EDITOR 1123 +#define IMG_CUSTOM_183 1124 +#define IMG_CUSTOM_183_EDITOR 1125 +#define IMG_CUSTOM_184 1126 +#define IMG_CUSTOM_184_EDITOR 1127 +#define IMG_CUSTOM_185 1128 +#define IMG_CUSTOM_185_EDITOR 1129 +#define IMG_CUSTOM_186 1130 +#define IMG_CUSTOM_186_EDITOR 1131 +#define IMG_CUSTOM_187 1132 +#define IMG_CUSTOM_187_EDITOR 1133 +#define IMG_CUSTOM_188 1134 +#define IMG_CUSTOM_188_EDITOR 1135 +#define IMG_CUSTOM_189 1136 +#define IMG_CUSTOM_189_EDITOR 1137 +#define IMG_CUSTOM_190 1138 +#define IMG_CUSTOM_190_EDITOR 1139 +#define IMG_CUSTOM_191 1140 +#define IMG_CUSTOM_191_EDITOR 1141 +#define IMG_CUSTOM_192 1142 +#define IMG_CUSTOM_192_EDITOR 1143 +#define IMG_CUSTOM_193 1144 +#define IMG_CUSTOM_193_EDITOR 1145 +#define IMG_CUSTOM_194 1146 +#define IMG_CUSTOM_194_EDITOR 1147 +#define IMG_CUSTOM_195 1148 +#define IMG_CUSTOM_195_EDITOR 1149 +#define IMG_CUSTOM_196 1150 +#define IMG_CUSTOM_196_EDITOR 1151 +#define IMG_CUSTOM_197 1152 +#define IMG_CUSTOM_197_EDITOR 1153 +#define IMG_CUSTOM_198 1154 +#define IMG_CUSTOM_198_EDITOR 1155 +#define IMG_CUSTOM_199 1156 +#define IMG_CUSTOM_199_EDITOR 1157 +#define IMG_CUSTOM_200 1158 +#define IMG_CUSTOM_200_EDITOR 1159 +#define IMG_CUSTOM_201 1160 +#define IMG_CUSTOM_201_EDITOR 1161 +#define IMG_CUSTOM_202 1162 +#define IMG_CUSTOM_202_EDITOR 1163 +#define IMG_CUSTOM_203 1164 +#define IMG_CUSTOM_203_EDITOR 1165 +#define IMG_CUSTOM_204 1166 +#define IMG_CUSTOM_204_EDITOR 1167 +#define IMG_CUSTOM_205 1168 +#define IMG_CUSTOM_205_EDITOR 1169 +#define IMG_CUSTOM_206 1170 +#define IMG_CUSTOM_206_EDITOR 1171 +#define IMG_CUSTOM_207 1172 +#define IMG_CUSTOM_207_EDITOR 1173 +#define IMG_CUSTOM_208 1174 +#define IMG_CUSTOM_208_EDITOR 1175 +#define IMG_CUSTOM_209 1176 +#define IMG_CUSTOM_209_EDITOR 1177 +#define IMG_CUSTOM_210 1178 +#define IMG_CUSTOM_210_EDITOR 1179 +#define IMG_CUSTOM_211 1180 +#define IMG_CUSTOM_211_EDITOR 1181 +#define IMG_CUSTOM_212 1182 +#define IMG_CUSTOM_212_EDITOR 1183 +#define IMG_CUSTOM_213 1184 +#define IMG_CUSTOM_213_EDITOR 1185 +#define IMG_CUSTOM_214 1186 +#define IMG_CUSTOM_214_EDITOR 1187 +#define IMG_CUSTOM_215 1188 +#define IMG_CUSTOM_215_EDITOR 1189 +#define IMG_CUSTOM_216 1190 +#define IMG_CUSTOM_216_EDITOR 1191 +#define IMG_CUSTOM_217 1192 +#define IMG_CUSTOM_217_EDITOR 1193 +#define IMG_CUSTOM_218 1194 +#define IMG_CUSTOM_218_EDITOR 1195 +#define IMG_CUSTOM_219 1196 +#define IMG_CUSTOM_219_EDITOR 1197 +#define IMG_CUSTOM_220 1198 +#define IMG_CUSTOM_220_EDITOR 1199 +#define IMG_CUSTOM_221 1200 +#define IMG_CUSTOM_221_EDITOR 1201 +#define IMG_CUSTOM_222 1202 +#define IMG_CUSTOM_222_EDITOR 1203 +#define IMG_CUSTOM_223 1204 +#define IMG_CUSTOM_223_EDITOR 1205 +#define IMG_CUSTOM_224 1206 +#define IMG_CUSTOM_224_EDITOR 1207 +#define IMG_CUSTOM_225 1208 +#define IMG_CUSTOM_225_EDITOR 1209 +#define IMG_CUSTOM_226 1210 +#define IMG_CUSTOM_226_EDITOR 1211 +#define IMG_CUSTOM_227 1212 +#define IMG_CUSTOM_227_EDITOR 1213 +#define IMG_CUSTOM_228 1214 +#define IMG_CUSTOM_228_EDITOR 1215 +#define IMG_CUSTOM_229 1216 +#define IMG_CUSTOM_229_EDITOR 1217 +#define IMG_CUSTOM_230 1218 +#define IMG_CUSTOM_230_EDITOR 1219 +#define IMG_CUSTOM_231 1220 +#define IMG_CUSTOM_231_EDITOR 1221 +#define IMG_CUSTOM_232 1222 +#define IMG_CUSTOM_232_EDITOR 1223 +#define IMG_CUSTOM_233 1224 +#define IMG_CUSTOM_233_EDITOR 1225 +#define IMG_CUSTOM_234 1226 +#define IMG_CUSTOM_234_EDITOR 1227 +#define IMG_CUSTOM_235 1228 +#define IMG_CUSTOM_235_EDITOR 1229 +#define IMG_CUSTOM_236 1230 +#define IMG_CUSTOM_236_EDITOR 1231 +#define IMG_CUSTOM_237 1232 +#define IMG_CUSTOM_237_EDITOR 1233 +#define IMG_CUSTOM_238 1234 +#define IMG_CUSTOM_238_EDITOR 1235 +#define IMG_CUSTOM_239 1236 +#define IMG_CUSTOM_239_EDITOR 1237 +#define IMG_CUSTOM_240 1238 +#define IMG_CUSTOM_240_EDITOR 1239 +#define IMG_CUSTOM_241 1240 +#define IMG_CUSTOM_241_EDITOR 1241 +#define IMG_CUSTOM_242 1242 +#define IMG_CUSTOM_242_EDITOR 1243 +#define IMG_CUSTOM_243 1244 +#define IMG_CUSTOM_243_EDITOR 1245 +#define IMG_CUSTOM_244 1246 +#define IMG_CUSTOM_244_EDITOR 1247 +#define IMG_CUSTOM_245 1248 +#define IMG_CUSTOM_245_EDITOR 1249 +#define IMG_CUSTOM_246 1250 +#define IMG_CUSTOM_246_EDITOR 1251 +#define IMG_CUSTOM_247 1252 +#define IMG_CUSTOM_247_EDITOR 1253 +#define IMG_CUSTOM_248 1254 +#define IMG_CUSTOM_248_EDITOR 1255 +#define IMG_CUSTOM_249 1256 +#define IMG_CUSTOM_249_EDITOR 1257 +#define IMG_CUSTOM_250 1258 +#define IMG_CUSTOM_250_EDITOR 1259 +#define IMG_CUSTOM_251 1260 +#define IMG_CUSTOM_251_EDITOR 1261 +#define IMG_CUSTOM_252 1262 +#define IMG_CUSTOM_252_EDITOR 1263 +#define IMG_CUSTOM_253 1264 +#define IMG_CUSTOM_253_EDITOR 1265 +#define IMG_CUSTOM_254 1266 +#define IMG_CUSTOM_254_EDITOR 1267 +#define IMG_CUSTOM_255 1268 +#define IMG_CUSTOM_255_EDITOR 1269 +#define IMG_CUSTOM_256 1270 +#define IMG_CUSTOM_256_EDITOR 1271 +#define IMG_GROUP_1 1272 +#define IMG_GROUP_1_EDITOR 1273 +#define IMG_GROUP_2 1274 +#define IMG_GROUP_2_EDITOR 1275 +#define IMG_GROUP_3 1276 +#define IMG_GROUP_3_EDITOR 1277 +#define IMG_GROUP_4 1278 +#define IMG_GROUP_4_EDITOR 1279 +#define IMG_GROUP_5 1280 +#define IMG_GROUP_5_EDITOR 1281 +#define IMG_GROUP_6 1282 +#define IMG_GROUP_6_EDITOR 1283 +#define IMG_GROUP_7 1284 +#define IMG_GROUP_7_EDITOR 1285 +#define IMG_GROUP_8 1286 +#define IMG_GROUP_8_EDITOR 1287 +#define IMG_GROUP_9 1288 +#define IMG_GROUP_9_EDITOR 1289 +#define IMG_GROUP_10 1290 +#define IMG_GROUP_10_EDITOR 1291 +#define IMG_GROUP_11 1292 +#define IMG_GROUP_11_EDITOR 1293 +#define IMG_GROUP_12 1294 +#define IMG_GROUP_12_EDITOR 1295 +#define IMG_GROUP_13 1296 +#define IMG_GROUP_13_EDITOR 1297 +#define IMG_GROUP_14 1298 +#define IMG_GROUP_14_EDITOR 1299 +#define IMG_GROUP_15 1300 +#define IMG_GROUP_15_EDITOR 1301 +#define IMG_GROUP_16 1302 +#define IMG_GROUP_16_EDITOR 1303 +#define IMG_GROUP_17 1304 +#define IMG_GROUP_17_EDITOR 1305 +#define IMG_GROUP_18 1306 +#define IMG_GROUP_18_EDITOR 1307 +#define IMG_GROUP_19 1308 +#define IMG_GROUP_19_EDITOR 1309 +#define IMG_GROUP_20 1310 +#define IMG_GROUP_20_EDITOR 1311 +#define IMG_GROUP_21 1312 +#define IMG_GROUP_21_EDITOR 1313 +#define IMG_GROUP_22 1314 +#define IMG_GROUP_22_EDITOR 1315 +#define IMG_GROUP_23 1316 +#define IMG_GROUP_23_EDITOR 1317 +#define IMG_GROUP_24 1318 +#define IMG_GROUP_24_EDITOR 1319 +#define IMG_GROUP_25 1320 +#define IMG_GROUP_25_EDITOR 1321 +#define IMG_GROUP_26 1322 +#define IMG_GROUP_26_EDITOR 1323 +#define IMG_GROUP_27 1324 +#define IMG_GROUP_27_EDITOR 1325 +#define IMG_GROUP_28 1326 +#define IMG_GROUP_28_EDITOR 1327 +#define IMG_GROUP_29 1328 +#define IMG_GROUP_29_EDITOR 1329 +#define IMG_GROUP_30 1330 +#define IMG_GROUP_30_EDITOR 1331 +#define IMG_GROUP_31 1332 +#define IMG_GROUP_31_EDITOR 1333 +#define IMG_GROUP_32 1334 +#define IMG_GROUP_32_EDITOR 1335 +#define IMG_EMC_OBJECT 1336 +#define IMG_EMC_SPRITE 1337 +#define IMG_TOON_1 1338 +#define IMG_TOON_2 1339 +#define IMG_TOON_3 1340 +#define IMG_TOON_4 1341 +#define IMG_TOON_5 1342 +#define IMG_TOON_6 1343 +#define IMG_TOON_7 1344 +#define IMG_TOON_8 1345 +#define IMG_TOON_9 1346 +#define IMG_TOON_10 1347 +#define IMG_TOON_11 1348 +#define IMG_TOON_12 1349 +#define IMG_TOON_13 1350 +#define IMG_TOON_14 1351 +#define IMG_TOON_15 1352 +#define IMG_TOON_16 1353 +#define IMG_TOON_17 1354 +#define IMG_TOON_18 1355 +#define IMG_TOON_19 1356 +#define IMG_TOON_20 1357 +#define IMG_MENU_CALIBRATE_RED 1358 +#define IMG_MENU_CALIBRATE_BLUE 1359 +#define IMG_MENU_CALIBRATE_YELLOW 1360 +#define IMG_MENU_BUTTON 1361 +#define IMG_MENU_BUTTON_ACTIVE 1362 +#define IMG_MENU_BUTTON_LEFT 1363 +#define IMG_MENU_BUTTON_RIGHT 1364 +#define IMG_MENU_BUTTON_UP 1365 +#define IMG_MENU_BUTTON_DOWN 1366 +#define IMG_MENU_BUTTON_LEFT_ACTIVE 1367 +#define IMG_MENU_BUTTON_RIGHT_ACTIVE 1368 +#define IMG_MENU_BUTTON_UP_ACTIVE 1369 +#define IMG_MENU_BUTTON_DOWN_ACTIVE 1370 +#define IMG_MENU_SCROLLBAR 1371 +#define IMG_MENU_SCROLLBAR_ACTIVE 1372 +#define IMG_FONT_INITIAL_1 1373 +#define IMG_FONT_INITIAL_2 1374 +#define IMG_FONT_INITIAL_3 1375 +#define IMG_FONT_INITIAL_4 1376 +#define IMG_FONT_TITLE_1 1377 +#define IMG_FONT_TITLE_1_LEVELS 1378 +#define IMG_FONT_TITLE_2 1379 +#define IMG_FONT_MENU_1 1380 +#define IMG_FONT_MENU_2 1381 +#define IMG_FONT_TEXT_1 1382 +#define IMG_FONT_TEXT_1_LEVELS 1383 +#define IMG_FONT_TEXT_1_PREVIEW 1384 +#define IMG_FONT_TEXT_1_SCORES 1385 +#define IMG_FONT_TEXT_1_ACTIVE_SCORES 1386 +#define IMG_FONT_TEXT_2 1387 +#define IMG_FONT_TEXT_2_LEVELS 1388 +#define IMG_FONT_TEXT_2_PREVIEW 1389 +#define IMG_FONT_TEXT_2_SCORES 1390 +#define IMG_FONT_TEXT_2_ACTIVE_SCORES 1391 +#define IMG_FONT_TEXT_3 1392 +#define IMG_FONT_TEXT_3_LEVELS 1393 +#define IMG_FONT_TEXT_3_PREVIEW 1394 +#define IMG_FONT_TEXT_3_SCORES 1395 +#define IMG_FONT_TEXT_3_ACTIVE_SCORES 1396 +#define IMG_FONT_TEXT_4 1397 +#define IMG_FONT_TEXT_4_LEVELS 1398 +#define IMG_FONT_TEXT_4_SCORES 1399 +#define IMG_FONT_TEXT_4_ACTIVE_SCORES 1400 +#define IMG_FONT_ENVELOPE_1 1401 +#define IMG_FONT_ENVELOPE_2 1402 +#define IMG_FONT_ENVELOPE_3 1403 +#define IMG_FONT_ENVELOPE_4 1404 +#define IMG_FONT_INPUT_1 1405 +#define IMG_FONT_INPUT_1_MAIN 1406 +#define IMG_FONT_INPUT_1_ACTIVE 1407 +#define IMG_FONT_INPUT_1_ACTIVE_MAIN 1408 +#define IMG_FONT_INPUT_1_ACTIVE_SETUP 1409 +#define IMG_FONT_INPUT_2 1410 +#define IMG_FONT_INPUT_2_ACTIVE 1411 +#define IMG_FONT_OPTION_OFF 1412 +#define IMG_FONT_OPTION_ON 1413 +#define IMG_FONT_VALUE_1 1414 +#define IMG_FONT_VALUE_2 1415 +#define IMG_FONT_VALUE_OLD 1416 +#define IMG_FONT_LEVEL_NUMBER 1417 +#define IMG_FONT_TAPE_RECORDER 1418 +#define IMG_FONT_GAME_INFO 1419 +#define IMG_GLOBAL_BORDER 1420 +#define IMG_GLOBAL_DOOR 1421 +#define IMG_EDITOR_ELEMENT_BORDER 1422 +#define IMG_EDITOR_ELEMENT_BORDER_INPUT 1423 +#define IMG_BACKGROUND_ENVELOPE_1 1424 +#define IMG_BACKGROUND_ENVELOPE_2 1425 +#define IMG_BACKGROUND_ENVELOPE_3 1426 +#define IMG_BACKGROUND_ENVELOPE_4 1427 +#define IMG_BACKGROUND 1428 +#define IMG_BACKGROUND_MAIN 1429 +#define IMG_BACKGROUND_LEVELS 1430 +#define IMG_BACKGROUND_SCORES 1431 +#define IMG_BACKGROUND_EDITOR 1432 +#define IMG_BACKGROUND_INFO 1433 +#define IMG_BACKGROUND_INFO_ELEMENTS 1434 +#define IMG_BACKGROUND_SETUP 1435 +#define IMG_BACKGROUND_DOOR 1436 -#define NUM_IMAGE_FILES 1419 +#define NUM_IMAGE_FILES 1437 #endif /* CONF_GFX_H */ diff --git a/src/conftime.h b/src/conftime.h index 99128248..d82c25c3 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2004-09-28 01:26]" +#define COMPILE_DATE_STRING "[2004-10-01 03:17]" diff --git a/src/editor.c b/src/editor.c index 42ba6bb8..c33f9873 100644 --- a/src/editor.c +++ b/src/editor.c @@ -2595,6 +2595,105 @@ static int *editor_el_emerald_mine_ptr = editor_el_emerald_mine; static int num_editor_hl_emerald_mine=SIZEOF_ARRAY_INT(editor_hl_emerald_mine); static int num_editor_el_emerald_mine=SIZEOF_ARRAY_INT(editor_el_emerald_mine); +static int editor_hl_emerald_mine_club[] = +{ + EL_CHAR('E'), + EL_CHAR('M'), + EL_CHAR('E'), + EL_CHAR('-'), + + EL_CHAR('R'), + EL_CHAR('A'), + EL_CHAR('L'), + EL_CHAR('D'), + + EL_CHAR('M'), + EL_CHAR('I'), + EL_CHAR('N'), + EL_CHAR('E'), + + EL_CHAR('C'), + EL_CHAR('L'), + EL_CHAR('U'), + EL_CHAR('B'), +}; + +static int editor_el_emerald_mine_club[] = +{ + EL_EMC_KEY_5, + EL_EMC_KEY_6, + EL_EMC_KEY_7, + EL_EMC_KEY_8, + + EL_EMC_GATE_5, + EL_EMC_GATE_6, + EL_EMC_GATE_7, + EL_EMC_GATE_8, + + EL_EMC_GATE_5_GRAY, + EL_EMC_GATE_6_GRAY, + EL_EMC_GATE_7_GRAY, + EL_EMC_GATE_8_GRAY, + + EL_EMC_STEELWALL_1, + EL_EMC_STEELWALL_2, + EL_EMC_STEELWALL_3, + EL_EMC_STEELWALL_4, + + EL_EMC_WALL_13, + EL_EMC_WALL_14, + EL_EMC_WALL_15, + EL_EMC_WALL_16, + + EL_EMC_WALL_SLIPPERY_1, + EL_EMC_WALL_SLIPPERY_2, + EL_EMC_WALL_SLIPPERY_3, + EL_EMC_WALL_SLIPPERY_4, + + EL_EMC_WALL_1, + EL_EMC_WALL_2, + EL_EMC_WALL_3, + EL_EMC_WALL_4, + + EL_EMC_WALL_5, + EL_EMC_WALL_6, + EL_EMC_WALL_7, + EL_EMC_WALL_8, + + EL_EMC_WALL_9, + EL_EMC_WALL_10, + EL_EMC_WALL_11, + EL_EMC_WALL_12, + + EL_EMC_ANDROID, + EL_BALLOON, + EL_BALLOON_SWITCH_ANY, + EL_BALLOON_SWITCH_NONE, + + EL_BALLOON_SWITCH_LEFT, + EL_BALLOON_SWITCH_RIGHT, + EL_BALLOON_SWITCH_UP, + EL_BALLOON_SWITCH_DOWN, + + EL_EMC_GRASS, + EL_EMC_PLANT, + EL_EMC_LENSES, + EL_EMC_MAGNIFIER, + + EL_EMC_MAGIC_BALL, + EL_EMC_MAGIC_BALL_SWITCH, + EL_SPRING, + EL_EMC_BUMPER, + +#if 0 + EL_EMC_LEVEL_BORDER, +#endif +}; +static int *editor_hl_emerald_mine_club_ptr = editor_hl_emerald_mine_club; +static int *editor_el_emerald_mine_club_ptr = editor_el_emerald_mine_club; +static int num_editor_hl_emerald_mine_club=SIZEOF_ARRAY_INT(editor_hl_emerald_mine_club); +static int num_editor_el_emerald_mine_club=SIZEOF_ARRAY_INT(editor_el_emerald_mine_club); + static int editor_hl_more[] = { EL_CHAR('M'), @@ -2672,13 +2771,8 @@ static int editor_el_more[] = EL_SPACESHIP, EL_MOLE_DOWN, - EL_BALLOON, - EL_BALLOON_SWITCH_ANY, - - EL_BALLOON_SWITCH_LEFT, - EL_BALLOON_SWITCH_RIGHT, - EL_BALLOON_SWITCH_UP, - EL_BALLOON_SWITCH_DOWN, + EL_EMPTY, + EL_EMPTY, EL_SATELLITE, EL_EXPANDABLE_WALL_HORIZONTAL, @@ -2689,16 +2783,6 @@ static int editor_el_more[] = EL_INVISIBLE_WALL, EL_SPEED_PILL, EL_BLACK_ORB, - - EL_EMC_STEELWALL_1, - EL_EMC_WALL_1, - EL_EMC_WALL_2, - EL_EMC_WALL_3, - - EL_EMC_WALL_4, - EL_EMC_WALL_5, - EL_EMC_WALL_6, - EL_EMC_WALL_7, }; static int *editor_hl_more_ptr = editor_hl_more; static int *editor_el_more_ptr = editor_el_more; @@ -2924,7 +3008,7 @@ static int editor_hl_dx_boulderdash[] = static int editor_el_dx_boulderdash[] = { - EL_SPRING, + EL_EMPTY, EL_TUBE_RIGHT_DOWN, EL_TUBE_HORIZONTAL_DOWN, EL_TUBE_LEFT_DOWN, @@ -3572,6 +3656,11 @@ editor_elements_info[] = &editor_hl_emerald_mine_ptr, &num_editor_hl_emerald_mine, &editor_el_emerald_mine_ptr, &num_editor_el_emerald_mine }, + { + &setup.editor.el_emerald_mine_club, + &editor_hl_emerald_mine_club_ptr, &num_editor_hl_emerald_mine_club, + &editor_el_emerald_mine_club_ptr, &num_editor_el_emerald_mine_club + }, { &setup.editor.el_more, &editor_hl_more_ptr, &num_editor_hl_more, diff --git a/src/files.c b/src/files.c index 20eadecd..38f50f88 100644 --- a/src/files.c +++ b/src/files.c @@ -1884,8 +1884,9 @@ void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) level->field[x][y] = new_element; } - level->field[ply1->x_initial - 1][ply1->y_initial - 1] = EL_PLAYER_1; + /* if both players are set to the same field, use the first player */ level->field[ply2->x_initial - 1][ply2->y_initial - 1] = EL_PLAYER_2; + level->field[ply1->x_initial - 1][ply1->y_initial - 1] = EL_PLAYER_1; } static void LoadLevelFromFileInfo_EM(struct LevelInfo *level, @@ -3956,18 +3957,19 @@ void SaveScore(int nr) /* editor setup */ #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH 0 #define SETUP_TOKEN_EDITOR_EL_EMERALD_MINE 1 -#define SETUP_TOKEN_EDITOR_EL_MORE 2 -#define SETUP_TOKEN_EDITOR_EL_SOKOBAN 3 -#define SETUP_TOKEN_EDITOR_EL_SUPAPLEX 4 -#define SETUP_TOKEN_EDITOR_EL_DIAMOND_CAVES 5 -#define SETUP_TOKEN_EDITOR_EL_DX_BOULDERDASH 6 -#define SETUP_TOKEN_EDITOR_EL_CHARS 7 -#define SETUP_TOKEN_EDITOR_EL_CUSTOM 8 -#define SETUP_TOKEN_EDITOR_EL_CUSTOM_MORE 9 -#define SETUP_TOKEN_EDITOR_EL_HEADLINES 10 -#define SETUP_TOKEN_EDITOR_EL_USER_DEFINED 11 - -#define NUM_EDITOR_SETUP_TOKENS 12 +#define SETUP_TOKEN_EDITOR_EL_EMERALD_MINE_CLUB 2 +#define SETUP_TOKEN_EDITOR_EL_MORE 3 +#define SETUP_TOKEN_EDITOR_EL_SOKOBAN 4 +#define SETUP_TOKEN_EDITOR_EL_SUPAPLEX 5 +#define SETUP_TOKEN_EDITOR_EL_DIAMOND_CAVES 6 +#define SETUP_TOKEN_EDITOR_EL_DX_BOULDERDASH 7 +#define SETUP_TOKEN_EDITOR_EL_CHARS 8 +#define SETUP_TOKEN_EDITOR_EL_CUSTOM 9 +#define SETUP_TOKEN_EDITOR_EL_CUSTOM_MORE 10 +#define SETUP_TOKEN_EDITOR_EL_HEADLINES 11 +#define SETUP_TOKEN_EDITOR_EL_USER_DEFINED 12 + +#define NUM_EDITOR_SETUP_TOKENS 13 /* shortcut setup */ #define SETUP_TOKEN_SHORTCUT_SAVE_GAME 0 @@ -4045,6 +4047,7 @@ static struct TokenInfo editor_setup_tokens[] = { { TYPE_SWITCH, &sei.el_boulderdash, "editor.el_boulderdash" }, { TYPE_SWITCH, &sei.el_emerald_mine, "editor.el_emerald_mine" }, + { TYPE_SWITCH, &sei.el_emerald_mine_club,"editor.el_emerald_mine_club"}, { TYPE_SWITCH, &sei.el_more, "editor.el_more" }, { TYPE_SWITCH, &sei.el_sokoban, "editor.el_sokoban" }, { TYPE_SWITCH, &sei.el_supaplex, "editor.el_supaplex" }, @@ -4141,16 +4144,17 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->override_level_sounds = FALSE; si->override_level_music = FALSE; - si->editor.el_boulderdash = TRUE; - si->editor.el_emerald_mine = TRUE; - si->editor.el_more = TRUE; - si->editor.el_sokoban = TRUE; - si->editor.el_supaplex = TRUE; - si->editor.el_diamond_caves = TRUE; - si->editor.el_dx_boulderdash = TRUE; - si->editor.el_chars = TRUE; - si->editor.el_custom = TRUE; - si->editor.el_custom_more = FALSE; + si->editor.el_boulderdash = TRUE; + si->editor.el_emerald_mine = TRUE; + si->editor.el_emerald_mine_club = TRUE; + si->editor.el_more = TRUE; + si->editor.el_sokoban = TRUE; + si->editor.el_supaplex = TRUE; + si->editor.el_diamond_caves = TRUE; + si->editor.el_dx_boulderdash = TRUE; + si->editor.el_chars = TRUE; + si->editor.el_custom = TRUE; + si->editor.el_custom_more = FALSE; si->editor.el_headlines = TRUE; si->editor.el_user_defined = FALSE; diff --git a/src/game_em/input.c b/src/game_em/input.c index 79efd2f9..f04718f7 100644 --- a/src/game_em/input.c +++ b/src/game_em/input.c @@ -129,6 +129,7 @@ void readjoy(byte action) if (action & JOY_BUTTON_1) fire = 1; +#if 1 ply1.joy_fire = fire; if (ply1.joy_stick || (north | east | south | west)) { @@ -137,4 +138,14 @@ void readjoy(byte action) ply1.joy_s = south; ply1.joy_w = west; } +#else + ply2.joy_fire = fire; + if (ply2.joy_stick || (north | east | south | west)) + { + ply2.joy_n = north; + ply2.joy_e = east; + ply2.joy_s = south; + ply2.joy_w = west; + } +#endif } diff --git a/src/libgame/system.h b/src/libgame/system.h index 3d5bd828..188b0811 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -550,6 +550,7 @@ struct SetupEditorInfo { boolean el_boulderdash; boolean el_emerald_mine; + boolean el_emerald_mine_club; boolean el_more; boolean el_sokoban; boolean el_supaplex; diff --git a/src/main.c b/src/main.c index d954b1ac..ab07ad01 100644 --- a/src/main.c +++ b/src/main.c @@ -3474,75 +3474,20 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "emc_android", "android", }, - { - "emc_android_right", - "emc_android", - "android", - }, - { - "emc_android_up", - "emc_android", - "android", - }, - { - "emc_android_left", - "emc_android", - "android", - }, - { - "emc_android_down", - "emc_android", - "android", - }, - { - "emc_android_left_up", - "emc_android", - "android", - }, - { - "emc_android_left_down", - "emc_android", - "android", - }, - { - "emc_android_right_up", - "emc_android", - "android", - }, - { - "emc_android_right_down", - "emc_android", - "android", - }, { "emc_grass", "emc_grass", "grass", }, { - "emc_generator_ball", - "emc_generator_ball", - "generator ball", - }, - { - "emc_gate_1", - "gate", - "door 1 (EMC style)", - }, - { - "emc_gate_2", - "gate", - "door 2 (EMC style)", + "emc_magic_ball", + "emc_magic_ball", + "magic ball", }, { - "emc_gate_3", - "gate", - "door 3 (EMC style)", - }, - { - "emc_gate_4", - "gate", - "door 4 (EMC style)", + "emc_magic_ball_switch", + "emc_magic_ball_switch", + "magic ball switch", }, { "emc_gate_5", @@ -3564,26 +3509,6 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "gate", "door 8 (EMC style)", }, - { - "emc_gate_1_gray", - "gate", - "gray door (EMC style, key 1)", - }, - { - "emc_gate_2_gray", - "gate", - "gray door (EMC style, key 2)", - }, - { - "emc_gate_3_gray", - "gate", - "gray door (EMC style, key 3)", - }, - { - "emc_gate_4_gray", - "gate", - "gray door (EMC style, key 4)", - }, { "emc_gate_5_gray", "gate", @@ -3604,26 +3529,6 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "gate", "gray door (EMC style, key 8)", }, - { - "emc_key_1", - "key", - "key 1 (EMC style)", - }, - { - "emc_key_2", - "key", - "key 2 (EMC style)", - }, - { - "emc_key_3", - "key", - "key 3 (EMC style)", - }, - { - "emc_key_4", - "key", - "key 4 (EMC style)", - }, { "emc_key_5", "key", @@ -3664,6 +3569,66 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "emc_magnifier", "magnifier", }, + { + "emc_wall_9", + "wall", + "normal wall" + }, + { + "emc_wall_10", + "wall", + "normal wall" + }, + { + "emc_wall_11", + "wall", + "normal wall" + }, + { + "emc_wall_12", + "wall", + "normal wall" + }, + { + "emc_wall_13", + "wall", + "normal wall" + }, + { + "emc_wall_14", + "wall", + "normal wall" + }, + { + "emc_wall_15", + "wall", + "normal wall" + }, + { + "emc_wall_16", + "wall", + "normal wall" + }, + { + "emc_wall_slippery_1", + "wall", + "slippery wall" + }, + { + "emc_wall_slippery_2", + "wall", + "slippery wall" + }, + { + "emc_wall_slippery_3", + "wall", + "slippery wall" + }, + { + "emc_wall_slippery_4", + "wall", + "slippery wall" + }, /* ----------------------------------------------------------------------- */ /* "real" (and therefore drawable) runtime elements */ diff --git a/src/main.h b/src/main.h index d5afcf72..65e3a7ee 100644 --- a/src/main.h +++ b/src/main.h @@ -968,46 +968,39 @@ #define EL_BALLOON_SWITCH_NONE 667 #define EL_EMC_LEVEL_BORDER 668 #define EL_EMC_ANDROID 669 -#define EL_EMC_ANDROID_RIGHT 670 -#define EL_EMC_ANDROID_UP 671 -#define EL_EMC_ANDROID_LEFT 672 -#define EL_EMC_ANDROID_DOWN 673 -#define EL_EMC_ANDROID_LEFT_UP 674 -#define EL_EMC_ANDROID_LEFT_DOWN 675 -#define EL_EMC_ANDROID_RIGHT_UP 676 -#define EL_EMC_ANDROID_RIGHT_DOWN 677 -#define EL_EMC_GRASS 678 -#define EL_EMC_GENERATOR_BALL 679 -#define EL_EMC_GATE_1 680 -#define EL_EMC_GATE_2 681 -#define EL_EMC_GATE_3 682 -#define EL_EMC_GATE_4 683 -#define EL_EMC_GATE_5 684 -#define EL_EMC_GATE_6 685 -#define EL_EMC_GATE_7 686 -#define EL_EMC_GATE_8 687 -#define EL_EMC_GATE_1_GRAY 688 -#define EL_EMC_GATE_2_GRAY 689 -#define EL_EMC_GATE_3_GRAY 690 -#define EL_EMC_GATE_4_GRAY 691 -#define EL_EMC_GATE_5_GRAY 692 -#define EL_EMC_GATE_6_GRAY 693 -#define EL_EMC_GATE_7_GRAY 694 -#define EL_EMC_GATE_8_GRAY 695 -#define EL_EMC_KEY_1 696 -#define EL_EMC_KEY_2 697 -#define EL_EMC_KEY_3 698 -#define EL_EMC_KEY_4 799 -#define EL_EMC_KEY_5 700 -#define EL_EMC_KEY_6 701 -#define EL_EMC_KEY_7 702 -#define EL_EMC_KEY_8 703 -#define EL_EMC_BUMPER 704 -#define EL_EMC_PLANT 705 -#define EL_EMC_LENSES 706 -#define EL_EMC_MAGNIFIER 707 - -#define NUM_FILE_ELEMENTS 708 +#define EL_EMC_GRASS 670 +#define EL_EMC_MAGIC_BALL 671 +#define EL_EMC_MAGIC_BALL_SWITCH 672 +#define EL_EMC_GATE_5 673 +#define EL_EMC_GATE_6 674 +#define EL_EMC_GATE_7 675 +#define EL_EMC_GATE_8 676 +#define EL_EMC_GATE_5_GRAY 677 +#define EL_EMC_GATE_6_GRAY 678 +#define EL_EMC_GATE_7_GRAY 679 +#define EL_EMC_GATE_8_GRAY 680 +#define EL_EMC_KEY_5 681 +#define EL_EMC_KEY_6 682 +#define EL_EMC_KEY_7 683 +#define EL_EMC_KEY_8 684 +#define EL_EMC_BUMPER 685 +#define EL_EMC_PLANT 686 +#define EL_EMC_LENSES 687 +#define EL_EMC_MAGNIFIER 688 +#define EL_EMC_WALL_9 689 +#define EL_EMC_WALL_10 690 +#define EL_EMC_WALL_11 691 +#define EL_EMC_WALL_12 692 +#define EL_EMC_WALL_13 693 +#define EL_EMC_WALL_14 694 +#define EL_EMC_WALL_15 695 +#define EL_EMC_WALL_16 696 +#define EL_EMC_WALL_SLIPPERY_1 697 +#define EL_EMC_WALL_SLIPPERY_2 698 +#define EL_EMC_WALL_SLIPPERY_3 699 +#define EL_EMC_WALL_SLIPPERY_4 700 + +#define NUM_FILE_ELEMENTS 701 /* "real" (and therefore drawable) runtime elements */ diff --git a/src/tools.c b/src/tools.c index c950c871..436b3cdb 100644 --- a/src/tools.c +++ b/src/tools.c @@ -3253,100 +3253,100 @@ mapping_EM_to_RND_list[] = EL_EMC_ANDROID, -1, -1 }, { - Xandroid_1_n, TRUE, - EL_EMC_ANDROID_UP, ACTION_MOVING, MV_BIT_UP + Xandroid_1_n, FALSE, + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_UP }, { Xandroid_2_n, FALSE, - EL_EMC_ANDROID_UP, ACTION_MOVING, MV_BIT_UP + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_UP }, { - Xandroid_1_e, TRUE, - EL_EMC_ANDROID_RIGHT, ACTION_MOVING, MV_BIT_RIGHT + Xandroid_1_e, FALSE, + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_RIGHT }, { Xandroid_2_e, FALSE, - EL_EMC_ANDROID_RIGHT, ACTION_MOVING, MV_BIT_RIGHT + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_RIGHT }, { - Xandroid_1_w, TRUE, - EL_EMC_ANDROID_LEFT, ACTION_MOVING, MV_BIT_LEFT + Xandroid_1_w, FALSE, + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_LEFT }, { Xandroid_2_w, FALSE, - EL_EMC_ANDROID_LEFT, ACTION_MOVING, MV_BIT_LEFT + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_LEFT }, { - Xandroid_1_s, TRUE, - EL_EMC_ANDROID_DOWN, ACTION_MOVING, MV_BIT_DOWN + Xandroid_1_s, FALSE, + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_DOWN }, { Xandroid_2_s, FALSE, - EL_EMC_ANDROID_DOWN, ACTION_MOVING, MV_BIT_DOWN + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_DOWN }, { Yandroid_n, FALSE, - EL_EMC_ANDROID_UP, ACTION_MOVING, MV_BIT_UP + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_UP }, { Yandroid_nB, FALSE, - EL_EMC_ANDROID_UP, ACTION_MOVING, MV_BIT_UP + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_UP }, { Yandroid_ne, FALSE, - EL_EMC_ANDROID_RIGHT_UP, + EL_EMC_ANDROID, -1, -1 }, { Yandroid_neB, FALSE, - EL_EMC_ANDROID_RIGHT_UP, -1, -1 + EL_EMC_ANDROID, -1, -1 }, { Yandroid_e, FALSE, - EL_EMC_ANDROID_RIGHT, ACTION_MOVING, MV_BIT_RIGHT + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_RIGHT }, { Yandroid_eB, FALSE, - EL_EMC_ANDROID_RIGHT, ACTION_MOVING, MV_BIT_RIGHT + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_RIGHT }, { Yandroid_se, FALSE, - EL_EMC_ANDROID_RIGHT_DOWN, -1, -1 + EL_EMC_ANDROID, -1, -1 }, { Yandroid_seB, FALSE, - EL_EMC_ANDROID_RIGHT_DOWN, -1, -1 + EL_EMC_ANDROID, -1, -1 }, { Yandroid_s, FALSE, - EL_EMC_ANDROID_DOWN, ACTION_MOVING, MV_BIT_DOWN + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_DOWN }, { Yandroid_sB, FALSE, - EL_EMC_ANDROID_DOWN, ACTION_MOVING, MV_BIT_DOWN + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_DOWN }, { Yandroid_sw, FALSE, - EL_EMC_ANDROID_LEFT_DOWN, -1, -1 + EL_EMC_ANDROID, -1, -1 }, { Yandroid_swB, FALSE, - EL_EMC_ANDROID_LEFT_DOWN, -1, -1 + EL_EMC_ANDROID, -1, -1 }, { Yandroid_w, FALSE, - EL_EMC_ANDROID_LEFT, ACTION_MOVING, MV_BIT_LEFT + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_LEFT }, { Yandroid_wB, FALSE, - EL_EMC_ANDROID_LEFT, ACTION_MOVING, MV_BIT_LEFT + EL_EMC_ANDROID, ACTION_MOVING, MV_BIT_LEFT }, { Yandroid_nw, FALSE, - EL_EMC_ANDROID_LEFT_UP, -1, -1 + EL_EMC_ANDROID, -1, -1 }, { Yandroid_nwB, FALSE, - EL_EMC_ANDROID_LEFT_UP, -1, -1 + EL_EMC_ANDROID, -1, -1 }, { Xspring, TRUE, @@ -3718,23 +3718,23 @@ mapping_EM_to_RND_list[] = }, { Xgrass, TRUE, - EL_SAND, -1, -1 + EL_EMC_GRASS, -1, -1 }, { Ygrass_nB, FALSE, - EL_SAND, ACTION_MOVING, MV_BIT_UP + EL_EMC_GRASS, ACTION_MOVING, MV_BIT_UP }, { Ygrass_eB, FALSE, - EL_SAND, ACTION_MOVING, MV_BIT_RIGHT + EL_EMC_GRASS, ACTION_MOVING, MV_BIT_RIGHT }, { Ygrass_sB, FALSE, - EL_SAND, ACTION_MOVING, MV_BIT_DOWN + EL_EMC_GRASS, ACTION_MOVING, MV_BIT_DOWN }, { Ygrass_wB, FALSE, - EL_SAND, ACTION_MOVING, MV_BIT_LEFT + EL_EMC_GRASS, ACTION_MOVING, MV_BIT_LEFT }, { Xdirt, TRUE, @@ -3810,23 +3810,23 @@ mapping_EM_to_RND_list[] = }, { Xball_1, TRUE, - EL_EMC_GENERATOR_BALL, -1, -1 + EL_EMC_MAGIC_BALL, -1, -1 }, { Xball_1B, FALSE, - EL_EMC_GENERATOR_BALL, -1, -1 + EL_EMC_MAGIC_BALL, -1, -1 }, { Xball_2, FALSE, - EL_EMC_GENERATOR_BALL, -1, -1 + EL_EMC_MAGIC_BALL, -1, -1 }, { Xball_2B, FALSE, - EL_EMC_GENERATOR_BALL, -1, -1 + EL_EMC_MAGIC_BALL, -1, -1 }, { Yball_eat, FALSE, - EL_EMC_GENERATOR_BALL, -1, -1 + EL_EMC_MAGIC_BALL, -1, -1 }, { Xgrow_ns, TRUE, @@ -4029,8 +4029,8 @@ mapping_EM_to_RND_list[] = EL_ROBOT_WHEEL, -1, -1 }, { - Xswitch, FALSE, - EL_UNKNOWN, -1, -1 + Xswitch, TRUE, + EL_EMC_MAGIC_BALL_SWITCH, -1, -1 }, { XswitchB, FALSE, @@ -4177,52 +4177,52 @@ mapping_EM_to_RND_list[] = EL_STEELWALL, -1, -1 }, { - Xsteel_2, FALSE, - EL_UNKNOWN, -1, -1 + Xsteel_2, TRUE, + EL_EMC_STEELWALL_2, -1, -1 }, { Xsteel_3, TRUE, - EL_EMC_STEELWALL_1, -1, -1 + EL_EMC_STEELWALL_3, -1, -1 }, { - Xsteel_4, FALSE, - EL_UNKNOWN, -1, -1 + Xsteel_4, TRUE, + EL_EMC_STEELWALL_4, -1, -1 }, { Xwall_1, TRUE, EL_WALL, -1, -1 }, { - Xwall_2, FALSE, - EL_UNKNOWN, -1, -1 + Xwall_2, TRUE, + EL_EMC_WALL_14, -1, -1 }, { - Xwall_3, FALSE, - EL_UNKNOWN, -1, -1 + Xwall_3, TRUE, + EL_EMC_WALL_15, -1, -1 }, { - Xwall_4, FALSE, - EL_UNKNOWN, -1, -1 + Xwall_4, TRUE, + EL_EMC_WALL_16, -1, -1 }, { Xround_wall_1, TRUE, EL_WALL_SLIPPERY, -1, -1 }, { - Xround_wall_2, FALSE, - EL_UNKNOWN, -1, -1 + Xround_wall_2, TRUE, + EL_EMC_WALL_SLIPPERY_2, -1, -1 }, { - Xround_wall_3, FALSE, - EL_UNKNOWN, -1, -1 + Xround_wall_3, TRUE, + EL_EMC_WALL_SLIPPERY_3, -1, -1 }, { - Xround_wall_4, FALSE, - EL_UNKNOWN, -1, -1 + Xround_wall_4, TRUE, + EL_EMC_WALL_SLIPPERY_4, -1, -1 }, { - Xdecor_1, FALSE, - EL_UNKNOWN, -1, -1 + Xdecor_1, TRUE, + EL_EMC_WALL_8, -1, -1 }, { Xdecor_2, TRUE, @@ -4234,19 +4234,19 @@ mapping_EM_to_RND_list[] = }, { Xdecor_4, TRUE, - EL_EMC_WALL_5, -1, -1 + EL_EMC_WALL_7, -1, -1 }, { Xdecor_5, TRUE, - EL_EMC_WALL_7, -1, -1 + EL_EMC_WALL_5, -1, -1 }, { Xdecor_6, TRUE, - EL_EMC_WALL_8, -1, -1 + EL_EMC_WALL_9, -1, -1 }, { - Xdecor_7, FALSE, - EL_UNKNOWN, -1, -1 + Xdecor_7, TRUE, + EL_EMC_WALL_10, -1, -1 }, { Xdecor_8, TRUE, @@ -4261,12 +4261,12 @@ mapping_EM_to_RND_list[] = EL_EMC_WALL_3, -1, -1 }, { - Xdecor_11, FALSE, - EL_UNKNOWN, -1, -1 + Xdecor_11, TRUE, + EL_EMC_WALL_11, -1, -1 }, { - Xdecor_12, FALSE, - EL_UNKNOWN, -1, -1 + Xdecor_12, TRUE, + EL_EMC_WALL_12, -1, -1 }, { Xalpha_0, TRUE, @@ -4572,7 +4572,7 @@ int map_element_RND_to_EM(int element_rnd) { Xacid_sw, EL_ACID_POOL_BOTTOMLEFT }, { Xacid_nw, EL_ACID_POOL_TOPLEFT }, { Xacid_1, EL_ACID }, - { Xball_1, EL_EMC_GENERATOR_BALL }, + { Xball_1, EL_EMC_MAGIC_BALL }, { Xgrow_ns, EL_EMC_GROW }, { Xwonderwall, EL_MAGIC_WALL }, { Xamoeba_1, EL_AMOEBA_WET }, @@ -4966,11 +4966,11 @@ int map_element_EM_to_RND(int element_em) { Xacid_6, EL_ACID }, { Xacid_7, EL_ACID }, { Xacid_8, EL_ACID }, - { Xball_1, EL_EMC_GENERATOR_BALL }, - { Xball_1B, EL_EMC_GENERATOR_BALL }, - { Xball_2, EL_EMC_GENERATOR_BALL }, - { Xball_2B, EL_EMC_GENERATOR_BALL }, - { Yball_eat, EL_EMC_GENERATOR_BALL }, + { Xball_1, EL_EMC_MAGIC_BALL }, + { Xball_1B, EL_EMC_MAGIC_BALL }, + { Xball_2, EL_EMC_MAGIC_BALL }, + { Xball_2B, EL_EMC_MAGIC_BALL }, + { Yball_eat, EL_EMC_MAGIC_BALL }, { Xgrow_ns, EL_EMC_GROW }, { Ygrow_ns_eat, EL_EMC_GROW }, { Xgrow_ew, EL_EMC_GROW }, -- 2.34.1