diff options
| author | Arnaud Boutonné | 2010-11-04 12:29:06 +0000 | 
|---|---|---|
| committer | Arnaud Boutonné | 2010-11-04 12:29:06 +0000 | 
| commit | bf787323ab235c08819771ef2886bf6fee6e2e34 (patch) | |
| tree | 59171c79cbb09f711f2481bf58ac97d7d9c7d536 /tools | |
| parent | 224f93cf0e3629f32295f0d98d2c65c5102fdbe6 (diff) | |
| download | scummvm-rg350-bf787323ab235c08819771ef2886bf6fee6e2e34.tar.gz scummvm-rg350-bf787323ab235c08819771ef2886bf6fee6e2e34.tar.bz2 scummvm-rg350-bf787323ab235c08819771ef2886bf6fee6e2e34.zip  | |
TOOL: Fix ticks per seconds for H1 Dos
svn-id: r54063
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/create_hugo/create_hugo.h | 2 | ||||
| -rw-r--r-- | tools/create_hugo/enums.h | 2 | ||||
| -rw-r--r-- | tools/create_hugo/staticdata.h | 2662 | 
3 files changed, 1333 insertions, 1333 deletions
diff --git a/tools/create_hugo/create_hugo.h b/tools/create_hugo/create_hugo.h index 0215885c1d..fe548d7855 100644 --- a/tools/create_hugo/create_hugo.h +++ b/tools/create_hugo/create_hugo.h @@ -31,7 +31,7 @@  #define DATAALIGNMENT 4  #define HUGO_DAT_VER_MAJ 0  // 1 byte -#define HUGO_DAT_VER_MIN 25 // 1 byte +#define HUGO_DAT_VER_MIN 26 // 1 byte  typedef unsigned char  uint8;  typedef unsigned char  byte; diff --git a/tools/create_hugo/enums.h b/tools/create_hugo/enums.h index a526c99ca5..e10cbe19b0 100644 --- a/tools/create_hugo/enums.h +++ b/tools/create_hugo/enums.h @@ -1388,8 +1388,6 @@ enum action_t {                                     // Parameters:  	OLD_SONG           = 49                         // Added by Strangerke - Set currently playing sound, old way: that is, using a string index instead of a reference in a file  }; -#define NORMAL_TPS     9                            // Number of ticks (frames) per second -  // Enumerate object numbers.  ALL objects must have an entry here in order.  enum objid_1w {  	HERO = 0,    DOOR1_1w,    EYES1_1w,  EYES2_1w,    BAT_1w,      PKIN_1w,      KEY_1w,      FENCE_1w,   TREE1_1w, diff --git a/tools/create_hugo/staticdata.h b/tools/create_hugo/staticdata.h index bd312bf705..b3aa54ebce 100644 --- a/tools/create_hugo/staticdata.h +++ b/tools/create_hugo/staticdata.h @@ -33,15 +33,17 @@  #ifndef STATICDATA_H  #define STATICDATA_H -#define NUM_VARIANTE   6 -#define MAZE_SCREEN    39							// First maze screen -#define DONT_CARE      0xFF							// Any state allowed in command verb -#define DOORDELAY      12							// Time for a door to open -#define PENDELAY       25							// Hold off going upstairs -#define STORYDELAY     (5 * NORMAL_TPS) -#define LIPDX          11							// To position LIPS object on person -#define LIPDY          8 -#define DARTTIME       70							// This many ticks to fall asleep +#define NUM_VARIANTE     6 +#define MAZE_SCREEN      39                         // First maze screen +#define DONT_CARE        0xFF                       // Any state allowed in command verb +#define DOORDELAY        12                         // Time for a door to open +#define PENDELAY         25                         // Hold off going upstairs +#define LIPDX            11                         // To position LIPS object on person +#define LIPDY            8 +#define DARTTIME         70                         // This many ticks to fall asleep +#define NORMAL_TPS_v1d   8                          // Number of ticks (frames) per second +#define NORMAL_TPS_v2d   9                          // Number of ticks (frames) per second +#define STORYDELAY       (5 * NORMAL_TPS_v2d)  //***************************************************************************  // Hugo 1 Windows @@ -5029,21 +5031,21 @@ const uint16 *screenActs_2d[] = {  	0,       0,       0  }; -uint16 s0acts_3d[]  = {kALcrashStory_3d, 0};                           // Crash site -uint16 s1acts_3d[]  = {kALweb_3d,        0};                             // Spider's web -uint16 s2acts_3d[]  = {kALbridgetip_3d,  0};                       // Bridge1 -uint16 s13acts_3d[] = {kALhut_in_3d,     kALmouse_3d, 0};                 // In hut -uint16 s15acts_3d[] = {kALoldman_3d,     kALflash_3d, 0};                 // Oldman -uint16 s18acts_3d[] = {kALcamp_3d,       0};                            // At camp -uint16 s19acts_3d[] = {kALsunset_3d,     0};                          // Bye bye! -uint16 s23acts_3d[] = {kALpath_3d,       0};                            // Elephant +uint16 s0acts_3d[]  = {kALcrashStory_3d, 0};              // Crash site +uint16 s1acts_3d[]  = {kALweb_3d,        0};              // Spider's web +uint16 s2acts_3d[]  = {kALbridgetip_3d,  0};              // Bridge1 +uint16 s13acts_3d[] = {kALhut_in_3d,     kALmouse_3d, 0}; // In hut +uint16 s15acts_3d[] = {kALoldman_3d,     kALflash_3d, 0}; // Oldman +uint16 s18acts_3d[] = {kALcamp_3d,       0};              // At camp +uint16 s19acts_3d[] = {kALsunset_3d,     0};              // Bye bye! +uint16 s23acts_3d[] = {kALpath_3d,       0};              // Elephant  const uint16 *screenActs_3d[] = { -	/*  0 */ s0acts_3d,  s1acts_3d, s2acts_3d, 0,       0, -	         0,       0,      0,      0,       0, -	/* 10 */ 0,       0,      0,      s13acts_3d, 0, -	         s15acts_3d, 0,      0,      s18acts_3d, s19acts_3d, -	/* 20 */ 0,       0,      0,      s23acts_3d, 0, -	         0,       0,      0,      0,       0, +	/*  0 */ s0acts_3d,  s1acts_3d, s2acts_3d, 0,          0, +	         0,          0,         0,         0,          0, +	/* 10 */ 0,          0,         0,         s13acts_3d, 0, +	         s15acts_3d, 0,         0,         s18acts_3d, s19acts_3d, +	/* 20 */ 0,          0,         0,         s23acts_3d, 0, +	         0,          0,         0,         0,          0,  	/* 30 */ 0  }; @@ -5715,137 +5717,137 @@ int openrep_1w[] = {kSTsopenr_1w, -1};  // Action lists (suffix with 0)  // These are the various actions, referred to in the command lists and/or  // referenced directly as part of screen actions -act0 areplight_1w  = {ASCHEDULE, 11 * NORMAL_TPS, kALightning_1w}; -act0 arepeye_1w    = {ASCHEDULE, 8 * NORMAL_TPS,  kALblinkeyes1_1w}; -act0 arepbat_1w    = {ASCHEDULE, 12 * NORMAL_TPS, kALbat_1w}; -act0 arepeye2_1w   = {ASCHEDULE, 8 * NORMAL_TPS,  kALblinkeyes2_1w}; -act0 arepredeye_1w = {ASCHEDULE, 6 * NORMAL_TPS,  kALrepredeye_1w}; -act0 areplips_1w   = {ASCHEDULE, 4 * NORMAL_TPS,  kALreplips_1w}; -act0 areparm_1w    = {ASCHEDULE, 5 * NORMAL_TPS,  kALreparm_1w}; -act0 adead_1w      = {ASCHEDULE, 0,               kALdead_1w}; -act0 arepbata_1w   = {ASCHEDULE, 3 * NORMAL_TPS,  kALbatrep_1w}; -act0 ajailrep_1w   = {ASCHEDULE, 4,               kALjailrep_1w}; -act0 aend_1w       = {ASCHEDULE, 4 * NORMAL_TPS,  kALend_1w}; -act0 arepbox_1w    = {ASCHEDULE, NORMAL_TPS,      kALbox_1w}; -act0 aweird_1w     = {ASCHEDULE, 16,              kALweird_1w}; -act0 acycle_1w     = {ASCHEDULE, 0,               kALcycle_1w}; - -act1 aopendoor1a_1w  = {START_OBJ, NORMAL_TPS,         DOOR1_1w,    1, CYCLE_FORWARD}; -act1 aclosedoor1_1w  = {START_OBJ, NORMAL_TPS,         DOOR1_1w,    1, CYCLE_BACKWARD}; -act1 ablink1a_1w     = {START_OBJ, 0,                  EYES1_1w,    0, INVISIBLE}; -act1 ablink1b_1w     = {START_OBJ, 1,                  EYES1_1w,    0, NOT_CYCLING}; -act1 ablink1c_1w     = {START_OBJ, 2,                  EYES1_1w,    0, INVISIBLE}; -act1 ablink1d_1w     = {START_OBJ, 3,                  EYES1_1w,    0, NOT_CYCLING}; -act1 ablink2a_1w     = {START_OBJ, 3 * NORMAL_TPS,     EYES2_1w,    0, INVISIBLE}; -act1 ablink2b_1w     = {START_OBJ, 3 * NORMAL_TPS + 1, EYES2_1w,    0, NOT_CYCLING}; -act1 ablink2c_1w     = {START_OBJ, 3 * NORMAL_TPS + 2, EYES2_1w,    0, INVISIBLE}; -act1 ablink2d_1w     = {START_OBJ, 3 * NORMAL_TPS + 3, EYES2_1w,    0, NOT_CYCLING}; -act1 aridpkin_1w     = {START_OBJ, 0,                  PKIN_1w,     0, INVISIBLE}; -act1 ashowkey_1w     = {START_OBJ, 0,                  KEY_1w,      0, NOT_CYCLING}; -act1 aridprof_1w     = {START_OBJ, 130 / DX,           PROF_1w,     0, INVISIBLE}; -act1 aopendoor2_1w   = {START_OBJ, 0,                  DOOR2_1w,    1, CYCLE_FORWARD}; -act1 aopendoor3_1w   = {START_OBJ, 0,                  DOOR3_1w,    1, CYCLE_FORWARD}; -act1 ablink3a_1w     = {START_OBJ, 0,                  EYES3_1w,    0, INVISIBLE}; -act1 ablink3b_1w     = {START_OBJ, 1,                  EYES3_1w,    0, NOT_CYCLING}; -act1 ablink3c_1w     = {START_OBJ, 2,                  EYES3_1w,    0, INVISIBLE}; -act1 ablink3d_1w     = {START_OBJ, 3,                  EYES3_1w,    0, NOT_CYCLING}; -act1 ablink4a_1w     = {START_OBJ, 3 * NORMAL_TPS,     EYES4_1w,    0, INVISIBLE}; -act1 ablink4b_1w     = {START_OBJ, 3 * NORMAL_TPS + 1, EYES4_1w,    0, NOT_CYCLING}; -act1 ablink4c_1w     = {START_OBJ, 3 * NORMAL_TPS + 2, EYES4_1w,    0, INVISIBLE}; -act1 ablink4d_1w     = {START_OBJ, 3 * NORMAL_TPS + 3, EYES4_1w,    0, NOT_CYCLING}; -act1 a115b_1w        = {START_OBJ, 0,                  MASK_1w,     0, NOT_CYCLING}; -act1 acupknife_1w    = {START_OBJ, 0,                  KNIFE_1w,    0, NOT_CYCLING}; -act1 acupwhist_1w    = {START_OBJ, 0,                  WHISTLE_1w,  0, NOT_CYCLING}; -act1 aopenwdoorl_1w  = {START_OBJ, NORMAL_TPS,         WDOORL_1w,   1, CYCLE_FORWARD}; -act1 aopenwdoorr_1w  = {START_OBJ, NORMAL_TPS,         WDOORR_1w,   1, CYCLE_FORWARD}; -act1 aopenwd1_1w     = {START_OBJ, NORMAL_TPS,         MASK_1w,     1, NOT_CYCLING}; -act1 aclosewdoorl_1w = {START_OBJ, NORMAL_TPS,         WDOORL_1w,   1, CYCLE_BACKWARD}; -act1 aclosewdoorr_1w = {START_OBJ, NORMAL_TPS,         WDOORR_1w,   1, CYCLE_BACKWARD}; -act1 abut1_1w        = {START_OBJ, 4 * NORMAL_TPS,     BUTLER_1w,   0, CYCLE_FORWARD}; -act1 abut6d_1w       = {START_OBJ, 7,                  HERO,        0, INVISIBLE}; -act1 abut6f_1w       = {START_OBJ, 7,                  HDLSHERO_1w, 0, NOT_CYCLING}; -act1 ashowchop_1w    = {START_OBJ, 0,                  CHOP_1w,     0, NOT_CYCLING}; -act1 aridchop_1w     = {START_OBJ, 0,                  CHOP_1w,     0, INVISIBLE}; -act1 adogcyc_1w      = {START_OBJ, 0,                  DOG_1w,      0, CYCLE_FORWARD}; -act1 ablink5a_1w     = {START_OBJ, 0,                  REDEYES_1w,  0, INVISIBLE}; -act1 ablink5b_1w     = {START_OBJ, 1,                  REDEYES_1w,  0, NOT_CYCLING}; -act1 ablink5c_1w     = {START_OBJ, 2,                  REDEYES_1w,  0, INVISIBLE}; -act1 ablink5d_1w     = {START_OBJ, 3,                  REDEYES_1w,  0, NOT_CYCLING}; -act1 alips_1w        = {START_OBJ, 0,                  LIPS_1w,     6, CYCLE_FORWARD}; -act1 aarm_1w         = {START_OBJ, 0,                  ARM_1w,      3, CYCLE_BACKWARD}; -act1 aopendoor4_1w   = {START_OBJ, 0,                  DOOR4_1w,    1, CYCLE_FORWARD}; -act1 aclosedoor4_1w  = {START_OBJ, 0,                  DOOR4_1w,    1, CYCLE_BACKWARD}; -act1 adog1_1w        = {START_OBJ, 0,                  DOG_1w,      0, CYCLE_FORWARD}; -act1 adead1_1w       = {START_OBJ, 0,                  HERO,        0, INVISIBLE}; -act1 adead3_1w       = {START_OBJ, 0,                  HERODEAD_1w, 0, NOT_CYCLING}; -act1 amovecarp1_1w   = {START_OBJ, 0,                  CARPET_1w,   0, INVISIBLE}; -act1 amovecarp2_1w   = {START_OBJ, 0,                  TRAP_1w,     0, NOT_CYCLING}; -act1 aopentrap_1w    = {START_OBJ, NORMAL_TPS,         TRAP_1w,     1, CYCLE_FORWARD}; -act1 aclosetrap_1w   = {START_OBJ, NORMAL_TPS,         TRAP_1w,     1, CYCLE_BACKWARD}; -act1 amdoor1_1w      = {START_OBJ, NORMAL_TPS,         MDOOR_1w,    1, CYCLE_FORWARD}; -act1 amdoor2_1w      = {START_OBJ, 3 * NORMAL_TPS,     MDOOR_1w,    0, INVISIBLE}; -act1 amum1_1w        = {START_OBJ, 2 * NORMAL_TPS,     MUMMY_1w,    0, CYCLE_FORWARD}; -act1 arock2_1w       = {START_OBJ, 0,                  HERO,        0, CYCLE_FORWARD}; -act1 arock7_1w       = {START_OBJ, 20,                 HERO,        0, NOT_CYCLING}; -act1 arock9_1w       = {START_OBJ, 40,                 HERO,        0, CYCLE_FORWARD}; -act1 arock14_1w      = {START_OBJ, 55,                 HERO,        0, NOT_CYCLING}; -act1 abin2_1w        = {START_OBJ, 0,                  HERO,        0, INVISIBLE}; -act1 aridbung_1w     = {START_OBJ, 0,                  BUNG_1w,     0, INVISIBLE}; -act1 about2_1w       = {START_OBJ, 0,                  HERO,        0, NOT_CYCLING}; -act1 ajail2_1w       = {START_OBJ, 0,                  HERO,        0, CYCLE_FORWARD}; -act1 atheend1_1w     = {START_OBJ, 5 * NORMAL_TPS,     HERO,        0, INVISIBLE}; -act1 aguardgo2_1w    = {START_OBJ, 0,                  GUARD_1w,    0, CYCLE_FORWARD}; -act1 alab5_1w        = {START_OBJ, 0,                  PROF_1w,     0, CYCLE_FORWARD}; -act1 alab8_1w        = {START_OBJ, 12,                 PROF_1w,     0, NOT_CYCLING}; -act1 alab9_1w        = {START_OBJ, 16,                 IGOR_1w,     0, NOT_CYCLING}; -act1 abox10_1w       = {START_OBJ, 38,                 PROF_1w,     0, CYCLE_FORWARD}; -act1 abox11_1w       = {START_OBJ, 73,                 PROF_1w,     0, INVISIBLE}; - -act2 abatxy_1w      = {INIT_OBJXY, 0,               BAT_1w,   95,  55}; -act2 aheroxy01_1w   = {INIT_OBJXY, 0,               HERO,     106, 130}; -act2 aheroxy12_1w   = {INIT_OBJXY, 12,              HERO,     169, 87}; -act2 aheroxy14_1w   = {INIT_OBJXY, 12,              HERO,     135, 115}; -act2 aheroxy10_1w   = {INIT_OBJXY, 0,               HERO,     33,  134}; -act2 aheroxy13_1w   = {INIT_OBJXY, 0,               HERO,     40,  127}; -act2 aheroxy15_1w   = {INIT_OBJXY, 0,               HERO,     250, 120}; -act2 ahchase2_1w    = {INIT_OBJXY, 5 * NORMAL_TPS,  DOG_1w,   280, 137}; -act2 akchase2_1w    = {INIT_OBJXY, 5 * NORMAL_TPS,  DOG_1w,   30,  120}; -act2 a115d_1w       = {INIT_OBJXY, 0,               MASK_1w,  236, 91}; -act2 aheroxy115_1w  = {INIT_OBJXY, 1,               HERO,     27,  130}; -act2 aheroxy21_1w   = {INIT_OBJXY, 0,               HERO,     130, 56}; -act2 achopxy_1w     = {INIT_OBJXY, 0,               CHOP_1w,  51,  155}; -act2 aheroxy31_1w   = {INIT_OBJXY, 0,               HERO,     263, 126}; -act2 aheroxy35_1w   = {INIT_OBJXY, 0,               HERO,     253, 96}; -act2 aheroxy41_1w   = {INIT_OBJXY, 0,               HERO,     200, 56}; -act2 aheroxy51_1w   = {INIT_OBJXY, 0,               HERO,     200, 110}; -act2 aheroxy53_1w   = {INIT_OBJXY, 0,               HERO,     50,  90}; -act2 aheroxy56_1w   = {INIT_OBJXY, 0,               HERO,     260, 140}; -act2 aheroxy57_1w   = {INIT_OBJXY, 0,               HERO,     245, 107}; -act2 aheroxy65_1w   = {INIT_OBJXY, 0,               HERO,     215, 96}; -act2 aheroxy75_1w   = {INIT_OBJXY, 0,               HERO,     25,  105}; -act2 adog4_1w       = {INIT_OBJXY, 0,               DOG_1w,   105, 119}; -act2 aheroxy78_1w   = {INIT_OBJXY, NORMAL_TPS + 12, HERO,     80,  42}; -act2 aheroxy89_1w   = {INIT_OBJXY, 0,               HERO,     276, 135}; -act2 aheroxy87_1w   = {INIT_OBJXY, 0,               HERO,     235, 108}; -act2 aheroxy910_1w  = {INIT_OBJXY, 0,               HERO,     50,  132}; -act2 aheroxy98_1w   = {INIT_OBJXY, 0,               HERO,     130, 120}; -act2 abata1c_1w     = {INIT_OBJXY, 0,               BAT2_1w,  65,  25}; -act2 abata2c_1w     = {INIT_OBJXY, 0,               BAT3_1w,  55,  65}; -act2 abata3c_1w     = {INIT_OBJXY, 0,               BAT4_1w,  50,  120}; -act2 abata4c_1w     = {INIT_OBJXY, 0,               BAT5_1w,  55,  130}; -act2 aheroxy109_1w  = {INIT_OBJXY, 0,               HERO,     96,  105}; -act2 aheroxy1011_1w = {INIT_OBJXY, 0,               HERO,     76,  130}; -act2 aheroxy1110_1w = {INIT_OBJXY, 0,               HERO,     261, 77}; -act2 aheroxy1112_1w = {INIT_OBJXY, 0,               HERO,     216, 134}; -act2 aherofar_1w    = {INIT_OBJXY, 0,               HERO,     142, 25}; -act2 aheronear_1w   = {INIT_OBJXY, 0,               HERO,     230, 132}; -act2 aheroxy1213_1w = {INIT_OBJXY, 0,               HERO,     131, 110}; -act2 aguardgo1_1w   = {INIT_OBJXY, 0,               GUARD_1w, 137, 39}; -act2 aheroxy1211_1w = {INIT_OBJXY, 0,               HERO,     291, 42}; -act2 aheroxy151_1w  = {INIT_OBJXY, 0,               HERO,     245, 55}; -act2 alab2_1w       = {INIT_OBJXY, 0,               PROF_1w,  100, 130}; -act2 abox4a_1w      = {INIT_OBJXY, 20,              HERO,     124, 122}; -act2 aigor12_1w     = {INIT_OBJXY, 30,              HERO,     116, 112}; +act0 areplight_1w  = {ASCHEDULE, 11 * NORMAL_TPS_v2d, kALightning_1w}; +act0 arepeye_1w    = {ASCHEDULE, 8 * NORMAL_TPS_v2d,  kALblinkeyes1_1w}; +act0 arepbat_1w    = {ASCHEDULE, 12 * NORMAL_TPS_v2d, kALbat_1w}; +act0 arepeye2_1w   = {ASCHEDULE, 8 * NORMAL_TPS_v2d,  kALblinkeyes2_1w}; +act0 arepredeye_1w = {ASCHEDULE, 6 * NORMAL_TPS_v2d,  kALrepredeye_1w}; +act0 areplips_1w   = {ASCHEDULE, 4 * NORMAL_TPS_v2d,  kALreplips_1w}; +act0 areparm_1w    = {ASCHEDULE, 5 * NORMAL_TPS_v2d,  kALreparm_1w}; +act0 adead_1w      = {ASCHEDULE, 0,                   kALdead_1w}; +act0 arepbata_1w   = {ASCHEDULE, 3 * NORMAL_TPS_v2d,  kALbatrep_1w}; +act0 ajailrep_1w   = {ASCHEDULE, 4,                   kALjailrep_1w}; +act0 aend_1w       = {ASCHEDULE, 4 * NORMAL_TPS_v2d,  kALend_1w}; +act0 arepbox_1w    = {ASCHEDULE, NORMAL_TPS_v2d,      kALbox_1w}; +act0 aweird_1w     = {ASCHEDULE, 16,                  kALweird_1w}; +act0 acycle_1w     = {ASCHEDULE, 0,                   kALcycle_1w}; + +act1 aopendoor1a_1w  = {START_OBJ, NORMAL_TPS_v2d,         DOOR1_1w,    1, CYCLE_FORWARD}; +act1 aclosedoor1_1w  = {START_OBJ, NORMAL_TPS_v2d,         DOOR1_1w,    1, CYCLE_BACKWARD}; +act1 ablink1a_1w     = {START_OBJ, 0,                      EYES1_1w,    0, INVISIBLE}; +act1 ablink1b_1w     = {START_OBJ, 1,                      EYES1_1w,    0, NOT_CYCLING}; +act1 ablink1c_1w     = {START_OBJ, 2,                      EYES1_1w,    0, INVISIBLE}; +act1 ablink1d_1w     = {START_OBJ, 3,                      EYES1_1w,    0, NOT_CYCLING}; +act1 ablink2a_1w     = {START_OBJ, 3 * NORMAL_TPS_v2d,     EYES2_1w,    0, INVISIBLE}; +act1 ablink2b_1w     = {START_OBJ, 3 * NORMAL_TPS_v2d + 1, EYES2_1w,    0, NOT_CYCLING}; +act1 ablink2c_1w     = {START_OBJ, 3 * NORMAL_TPS_v2d + 2, EYES2_1w,    0, INVISIBLE}; +act1 ablink2d_1w     = {START_OBJ, 3 * NORMAL_TPS_v2d + 3, EYES2_1w,    0, NOT_CYCLING}; +act1 aridpkin_1w     = {START_OBJ, 0,                      PKIN_1w,     0, INVISIBLE}; +act1 ashowkey_1w     = {START_OBJ, 0,                      KEY_1w,      0, NOT_CYCLING}; +act1 aridprof_1w     = {START_OBJ, 130 / DX,               PROF_1w,     0, INVISIBLE}; +act1 aopendoor2_1w   = {START_OBJ, 0,                      DOOR2_1w,    1, CYCLE_FORWARD}; +act1 aopendoor3_1w   = {START_OBJ, 0,                      DOOR3_1w,    1, CYCLE_FORWARD}; +act1 ablink3a_1w     = {START_OBJ, 0,                      EYES3_1w,    0, INVISIBLE}; +act1 ablink3b_1w     = {START_OBJ, 1,                      EYES3_1w,    0, NOT_CYCLING}; +act1 ablink3c_1w     = {START_OBJ, 2,                      EYES3_1w,    0, INVISIBLE}; +act1 ablink3d_1w     = {START_OBJ, 3,                      EYES3_1w,    0, NOT_CYCLING}; +act1 ablink4a_1w     = {START_OBJ, 3 * NORMAL_TPS_v2d,     EYES4_1w,    0, INVISIBLE}; +act1 ablink4b_1w     = {START_OBJ, 3 * NORMAL_TPS_v2d + 1, EYES4_1w,    0, NOT_CYCLING}; +act1 ablink4c_1w     = {START_OBJ, 3 * NORMAL_TPS_v2d + 2, EYES4_1w,    0, INVISIBLE}; +act1 ablink4d_1w     = {START_OBJ, 3 * NORMAL_TPS_v2d + 3, EYES4_1w,    0, NOT_CYCLING}; +act1 a115b_1w        = {START_OBJ, 0,                      MASK_1w,     0, NOT_CYCLING}; +act1 acupknife_1w    = {START_OBJ, 0,                      KNIFE_1w,    0, NOT_CYCLING}; +act1 acupwhist_1w    = {START_OBJ, 0,                      WHISTLE_1w,  0, NOT_CYCLING}; +act1 aopenwdoorl_1w  = {START_OBJ, NORMAL_TPS_v2d,         WDOORL_1w,   1, CYCLE_FORWARD}; +act1 aopenwdoorr_1w  = {START_OBJ, NORMAL_TPS_v2d,         WDOORR_1w,   1, CYCLE_FORWARD}; +act1 aopenwd1_1w     = {START_OBJ, NORMAL_TPS_v2d,         MASK_1w,     1, NOT_CYCLING}; +act1 aclosewdoorl_1w = {START_OBJ, NORMAL_TPS_v2d,         WDOORL_1w,   1, CYCLE_BACKWARD}; +act1 aclosewdoorr_1w = {START_OBJ, NORMAL_TPS_v2d,         WDOORR_1w,   1, CYCLE_BACKWARD}; +act1 abut1_1w        = {START_OBJ, 4 * NORMAL_TPS_v2d,     BUTLER_1w,   0, CYCLE_FORWARD}; +act1 abut6d_1w       = {START_OBJ, 7,                      HERO,        0, INVISIBLE}; +act1 abut6f_1w       = {START_OBJ, 7,                      HDLSHERO_1w, 0, NOT_CYCLING}; +act1 ashowchop_1w    = {START_OBJ, 0,                      CHOP_1w,     0, NOT_CYCLING}; +act1 aridchop_1w     = {START_OBJ, 0,                      CHOP_1w,     0, INVISIBLE}; +act1 adogcyc_1w      = {START_OBJ, 0,                      DOG_1w,      0, CYCLE_FORWARD}; +act1 ablink5a_1w     = {START_OBJ, 0,                      REDEYES_1w,  0, INVISIBLE}; +act1 ablink5b_1w     = {START_OBJ, 1,                      REDEYES_1w,  0, NOT_CYCLING}; +act1 ablink5c_1w     = {START_OBJ, 2,                      REDEYES_1w,  0, INVISIBLE}; +act1 ablink5d_1w     = {START_OBJ, 3,                      REDEYES_1w,  0, NOT_CYCLING}; +act1 alips_1w        = {START_OBJ, 0,                      LIPS_1w,     6, CYCLE_FORWARD}; +act1 aarm_1w         = {START_OBJ, 0,                      ARM_1w,      3, CYCLE_BACKWARD}; +act1 aopendoor4_1w   = {START_OBJ, 0,                      DOOR4_1w,    1, CYCLE_FORWARD}; +act1 aclosedoor4_1w  = {START_OBJ, 0,                      DOOR4_1w,    1, CYCLE_BACKWARD}; +act1 adog1_1w        = {START_OBJ, 0,                      DOG_1w,      0, CYCLE_FORWARD}; +act1 adead1_1w       = {START_OBJ, 0,                      HERO,        0, INVISIBLE}; +act1 adead3_1w       = {START_OBJ, 0,                      HERODEAD_1w, 0, NOT_CYCLING}; +act1 amovecarp1_1w   = {START_OBJ, 0,                      CARPET_1w,   0, INVISIBLE}; +act1 amovecarp2_1w   = {START_OBJ, 0,                      TRAP_1w,     0, NOT_CYCLING}; +act1 aopentrap_1w    = {START_OBJ, NORMAL_TPS_v2d,         TRAP_1w,     1, CYCLE_FORWARD}; +act1 aclosetrap_1w   = {START_OBJ, NORMAL_TPS_v2d,         TRAP_1w,     1, CYCLE_BACKWARD}; +act1 amdoor1_1w      = {START_OBJ, NORMAL_TPS_v2d,         MDOOR_1w,    1, CYCLE_FORWARD}; +act1 amdoor2_1w      = {START_OBJ, 3 * NORMAL_TPS_v2d,     MDOOR_1w,    0, INVISIBLE}; +act1 amum1_1w        = {START_OBJ, 2 * NORMAL_TPS_v2d,     MUMMY_1w,    0, CYCLE_FORWARD}; +act1 arock2_1w       = {START_OBJ, 0,                      HERO,        0, CYCLE_FORWARD}; +act1 arock7_1w       = {START_OBJ, 20,                     HERO,        0, NOT_CYCLING}; +act1 arock9_1w       = {START_OBJ, 40,                     HERO,        0, CYCLE_FORWARD}; +act1 arock14_1w      = {START_OBJ, 55,                     HERO,        0, NOT_CYCLING}; +act1 abin2_1w        = {START_OBJ, 0,                      HERO,        0, INVISIBLE}; +act1 aridbung_1w     = {START_OBJ, 0,                      BUNG_1w,     0, INVISIBLE}; +act1 about2_1w       = {START_OBJ, 0,                      HERO,        0, NOT_CYCLING}; +act1 ajail2_1w       = {START_OBJ, 0,                      HERO,        0, CYCLE_FORWARD}; +act1 atheend1_1w     = {START_OBJ, 5 * NORMAL_TPS_v2d,     HERO,        0, INVISIBLE}; +act1 aguardgo2_1w    = {START_OBJ, 0,                      GUARD_1w,    0, CYCLE_FORWARD}; +act1 alab5_1w        = {START_OBJ, 0,                      PROF_1w,     0, CYCLE_FORWARD}; +act1 alab8_1w        = {START_OBJ, 12,                     PROF_1w,     0, NOT_CYCLING}; +act1 alab9_1w        = {START_OBJ, 16,                     IGOR_1w,     0, NOT_CYCLING}; +act1 abox10_1w       = {START_OBJ, 38,                     PROF_1w,     0, CYCLE_FORWARD}; +act1 abox11_1w       = {START_OBJ, 73,                     PROF_1w,     0, INVISIBLE}; + +act2 abatxy_1w      = {INIT_OBJXY, 0,                   BAT_1w,   95,  55}; +act2 aheroxy01_1w   = {INIT_OBJXY, 0,                   HERO,     106, 130}; +act2 aheroxy12_1w   = {INIT_OBJXY, 12,                  HERO,     169, 87}; +act2 aheroxy14_1w   = {INIT_OBJXY, 12,                  HERO,     135, 115}; +act2 aheroxy10_1w   = {INIT_OBJXY, 0,                   HERO,     33,  134}; +act2 aheroxy13_1w   = {INIT_OBJXY, 0,                   HERO,     40,  127}; +act2 aheroxy15_1w   = {INIT_OBJXY, 0,                   HERO,     250, 120}; +act2 ahchase2_1w    = {INIT_OBJXY, 5 * NORMAL_TPS_v2d,  DOG_1w,   280, 137}; +act2 akchase2_1w    = {INIT_OBJXY, 5 * NORMAL_TPS_v2d,  DOG_1w,   30,  120}; +act2 a115d_1w       = {INIT_OBJXY, 0,                   MASK_1w,  236, 91}; +act2 aheroxy115_1w  = {INIT_OBJXY, 1,                   HERO,     27,  130}; +act2 aheroxy21_1w   = {INIT_OBJXY, 0,                   HERO,     130, 56}; +act2 achopxy_1w     = {INIT_OBJXY, 0,                   CHOP_1w,  51,  155}; +act2 aheroxy31_1w   = {INIT_OBJXY, 0,                   HERO,     263, 126}; +act2 aheroxy35_1w   = {INIT_OBJXY, 0,                   HERO,     253, 96}; +act2 aheroxy41_1w   = {INIT_OBJXY, 0,                   HERO,     200, 56}; +act2 aheroxy51_1w   = {INIT_OBJXY, 0,                   HERO,     200, 110}; +act2 aheroxy53_1w   = {INIT_OBJXY, 0,                   HERO,     50,  90}; +act2 aheroxy56_1w   = {INIT_OBJXY, 0,                   HERO,     260, 140}; +act2 aheroxy57_1w   = {INIT_OBJXY, 0,                   HERO,     245, 107}; +act2 aheroxy65_1w   = {INIT_OBJXY, 0,                   HERO,     215, 96}; +act2 aheroxy75_1w   = {INIT_OBJXY, 0,                   HERO,     25,  105}; +act2 adog4_1w       = {INIT_OBJXY, 0,                   DOG_1w,   105, 119}; +act2 aheroxy78_1w   = {INIT_OBJXY, NORMAL_TPS_v2d + 12, HERO,     80,  42}; +act2 aheroxy89_1w   = {INIT_OBJXY, 0,                   HERO,     276, 135}; +act2 aheroxy87_1w   = {INIT_OBJXY, 0,                   HERO,     235, 108}; +act2 aheroxy910_1w  = {INIT_OBJXY, 0,                   HERO,     50,  132}; +act2 aheroxy98_1w   = {INIT_OBJXY, 0,                   HERO,     130, 120}; +act2 abata1c_1w     = {INIT_OBJXY, 0,                   BAT2_1w,  65,  25}; +act2 abata2c_1w     = {INIT_OBJXY, 0,                   BAT3_1w,  55,  65}; +act2 abata3c_1w     = {INIT_OBJXY, 0,                   BAT4_1w,  50,  120}; +act2 abata4c_1w     = {INIT_OBJXY, 0,                   BAT5_1w,  55,  130}; +act2 aheroxy109_1w  = {INIT_OBJXY, 0,                   HERO,     96,  105}; +act2 aheroxy1011_1w = {INIT_OBJXY, 0,                   HERO,     76,  130}; +act2 aheroxy1110_1w = {INIT_OBJXY, 0,                   HERO,     261, 77}; +act2 aheroxy1112_1w = {INIT_OBJXY, 0,                   HERO,     216, 134}; +act2 aherofar_1w    = {INIT_OBJXY, 0,                   HERO,     142, 25}; +act2 aheronear_1w   = {INIT_OBJXY, 0,                   HERO,     230, 132}; +act2 aheroxy1213_1w = {INIT_OBJXY, 0,                   HERO,     131, 110}; +act2 aguardgo1_1w   = {INIT_OBJXY, 0,                   GUARD_1w, 137, 39}; +act2 aheroxy1211_1w = {INIT_OBJXY, 0,                   HERO,     291, 42}; +act2 aheroxy151_1w  = {INIT_OBJXY, 0,                   HERO,     245, 55}; +act2 alab2_1w       = {INIT_OBJXY, 0,                   PROF_1w,  100, 130}; +act2 abox4a_1w      = {INIT_OBJXY, 20,                  HERO,     124, 122}; +act2 aigor12_1w     = {INIT_OBJXY, 30,                  HERO,     116, 112};  act3 aopenp_1w = {PROMPT, 0, kSTsopenp_1w, openrep_1w, kALopenyes_1w, kALopenno_1w, false};  act3 amanq1_1w = {PROMPT, 0, kSTsq1_1w,    rep1_1w,    kALrepyes1_1w, kALrepno1_1w, false}; @@ -5869,44 +5871,44 @@ act4 abg6_1w     = {BKGD_COLOR, 10, _LIGHTMAGENTA};  act4 abg7_1w     = {BKGD_COLOR, 12, _LIGHTRED};  act4 abg8_1w     = {BKGD_COLOR, 14, _BLACK}; -act5 aopendoor1b_1w = {INIT_OBJVXY, 0,              HERO,      DX,     -DY}; -act5 abatvxy1_1w    = {INIT_OBJVXY, 0,              BAT_1w,    2,      -2}; -act5 abatvxy2_1w    = {INIT_OBJVXY, 20,             BAT_1w,    -1,     1}; -act5 abatvxy3_1w    = {INIT_OBJVXY, 40,             BAT_1w,    -1,     -1}; -act5 abatvxy4_1w    = {INIT_OBJVXY, 50,             BAT_1w,    -5,     0}; -act5 abatvxy5_1w    = {INIT_OBJVXY, 60,             BAT_1w,    0,      0}; -act5 astophero_1w   = {INIT_OBJVXY, 0,              HERO,      0,      0}; -act5 abutvxy1_1w    = {INIT_OBJVXY, 4 * NORMAL_TPS, BUTLER_1w, DX - 2, 0}; -act5 adead4_1w      = {INIT_OBJVXY, 0,              HERO,      0,      0}; -act5 arock4_1w      = {INIT_OBJVXY, 0,              HERO,      DX,     0}; -act5 arock6_1w      = {INIT_OBJVXY, 11,             HERO,      0,      -DY}; -act5 arock8_1w      = {INIT_OBJVXY, 20,             HERO,      0,      0}; -act5 arock11_1w     = {INIT_OBJVXY, 40,             HERO,      0,      -DY}; -act5 arock13_1w     = {INIT_OBJVXY, 44,             HERO,      0,      DY}; -act5 arock15_1w     = {INIT_OBJVXY, 55,             HERO,      0,      0}; -act5 ahin2_1w       = {INIT_OBJVXY, 0,              HERO,      0,      0}; -act5 aboatvxy1_1w   = {INIT_OBJVXY, 0,              BOAT_1w,   0,      -2}; -act5 aboatvxy2_1w   = {INIT_OBJVXY, 10,             BOAT_1w,   -5,     0}; -act5 aboatvxy3_1w   = {INIT_OBJVXY, 20,             BOAT_1w,   2,      0}; -act5 aboatvxy4_1w   = {INIT_OBJVXY, 50,             BOAT_1w,   1,      -1}; -act5 aboatvxy5_1w   = {INIT_OBJVXY, 60,             BOAT_1w,   -2,     -3}; -act5 aboatvxy6_1w   = {INIT_OBJVXY, 70,             BOAT_1w,   -3,     0}; -act5 aboatvxy7_1w   = {INIT_OBJVXY, 100,            BOAT_1w,   0,      -3}; -act5 aboatvxy8_1w   = {INIT_OBJVXY, 104,            BOAT_1w,   -1,     -1}; -act5 aboatvxy9_1w   = {INIT_OBJVXY, 107,            BOAT_1w,   0,      0}; -act5 aboatvxy10_1w  = {INIT_OBJVXY, 0,              BOAT_1w,   9,      7}; -act5 aboatvxy11_1w  = {INIT_OBJVXY, 3,              BOAT_1w,   0,      0}; -act5 aboatvxy12_1w  = {INIT_OBJVXY, 10,             BOAT_1w,   1,      1}; -act5 aguardgo4_1w   = {INIT_OBJVXY, 0,              GUARD_1w,  -DX,    0}; -act5 alab3_1w       = {INIT_OBJVXY, 0,              PROF_1w,   DX,     0}; -act5 alab6_1w       = {INIT_OBJVXY, 12,             PROF_1w,   0,      0}; -act5 alab7_1w       = {INIT_OBJVXY, 16,             IGOR_1w,   0,      0}; -act5 abox0_1w       = {INIT_OBJVXY, 0,              GDOOR_1w,  6,      0}; -act5 abox1_1w       = {INIT_OBJVXY, 9,              GDOOR_1w,  0,      0}; -act5 abox7_1w       = {INIT_OBJVXY, 50,             GDOOR_1w,  -6,     0}; -act5 abox8_1w       = {INIT_OBJVXY, 57,             GDOOR_1w,  0,      0}; -act5 abox8a_1w      = {INIT_OBJVXY, 56,             GDOOR_1w,  0,      0}; -act5 abox9_1w       = {INIT_OBJVXY, 38,             PROF_1w,   -DX,    0}; +act5 aopendoor1b_1w = {INIT_OBJVXY, 0,                  HERO,      DX,     -DY}; +act5 abatvxy1_1w    = {INIT_OBJVXY, 0,                  BAT_1w,    2,      -2}; +act5 abatvxy2_1w    = {INIT_OBJVXY, 20,                 BAT_1w,    -1,     1}; +act5 abatvxy3_1w    = {INIT_OBJVXY, 40,                 BAT_1w,    -1,     -1}; +act5 abatvxy4_1w    = {INIT_OBJVXY, 50,                 BAT_1w,    -5,     0}; +act5 abatvxy5_1w    = {INIT_OBJVXY, 60,                 BAT_1w,    0,      0}; +act5 astophero_1w   = {INIT_OBJVXY, 0,                  HERO,      0,      0}; +act5 abutvxy1_1w    = {INIT_OBJVXY, 4 * NORMAL_TPS_v2d, BUTLER_1w, DX - 2, 0}; +act5 adead4_1w      = {INIT_OBJVXY, 0,                  HERO,      0,      0}; +act5 arock4_1w      = {INIT_OBJVXY, 0,                  HERO,      DX,     0}; +act5 arock6_1w      = {INIT_OBJVXY, 11,                 HERO,      0,      -DY}; +act5 arock8_1w      = {INIT_OBJVXY, 20,                 HERO,      0,      0}; +act5 arock11_1w     = {INIT_OBJVXY, 40,                 HERO,      0,      -DY}; +act5 arock13_1w     = {INIT_OBJVXY, 44,                 HERO,      0,      DY}; +act5 arock15_1w     = {INIT_OBJVXY, 55,                 HERO,      0,      0}; +act5 ahin2_1w       = {INIT_OBJVXY, 0,                  HERO,      0,      0}; +act5 aboatvxy1_1w   = {INIT_OBJVXY, 0,                  BOAT_1w,   0,      -2}; +act5 aboatvxy2_1w   = {INIT_OBJVXY, 10,                 BOAT_1w,   -5,     0}; +act5 aboatvxy3_1w   = {INIT_OBJVXY, 20,                 BOAT_1w,   2,      0}; +act5 aboatvxy4_1w   = {INIT_OBJVXY, 50,                 BOAT_1w,   1,      -1}; +act5 aboatvxy5_1w   = {INIT_OBJVXY, 60,                 BOAT_1w,   -2,     -3}; +act5 aboatvxy6_1w   = {INIT_OBJVXY, 70,                 BOAT_1w,   -3,     0}; +act5 aboatvxy7_1w   = {INIT_OBJVXY, 100,                BOAT_1w,   0,      -3}; +act5 aboatvxy8_1w   = {INIT_OBJVXY, 104,                BOAT_1w,   -1,     -1}; +act5 aboatvxy9_1w   = {INIT_OBJVXY, 107,                BOAT_1w,   0,      0}; +act5 aboatvxy10_1w  = {INIT_OBJVXY, 0,                  BOAT_1w,   9,      7}; +act5 aboatvxy11_1w  = {INIT_OBJVXY, 3,                  BOAT_1w,   0,      0}; +act5 aboatvxy12_1w  = {INIT_OBJVXY, 10,                 BOAT_1w,   1,      1}; +act5 aguardgo4_1w   = {INIT_OBJVXY, 0,                  GUARD_1w,  -DX,    0}; +act5 alab3_1w       = {INIT_OBJVXY, 0,                  PROF_1w,   DX,     0}; +act5 alab6_1w       = {INIT_OBJVXY, 12,                 PROF_1w,   0,      0}; +act5 alab7_1w       = {INIT_OBJVXY, 16,                 IGOR_1w,   0,      0}; +act5 abox0_1w       = {INIT_OBJVXY, 0,                  GDOOR_1w,  6,      0}; +act5 abox1_1w       = {INIT_OBJVXY, 9,                  GDOOR_1w,  0,      0}; +act5 abox7_1w       = {INIT_OBJVXY, 50,                 GDOOR_1w,  -6,     0}; +act5 abox8_1w       = {INIT_OBJVXY, 57,                 GDOOR_1w,  0,      0}; +act5 abox8a_1w      = {INIT_OBJVXY, 56,                 GDOOR_1w,  0,      0}; +act5 abox9_1w       = {INIT_OBJVXY, 38,                 PROF_1w,   -DX,    0};  act6 adroppkin_1w = {INIT_CARRY, 0, PKIN_1w,   false};  act6 a115c_1w     = {INIT_CARRY, 0, MASK_1w,   false}; @@ -5916,97 +5918,97 @@ act6 adropchop_1w = {INIT_CARRY, 0, CHOP_1w,   false};  act6 ashedoil3_1w = {INIT_CARRY, 0, OILCAN_1w, true};  act6 adropbung_1w = {INIT_CARRY, 0, BUNG_1w,   false}; -act7 amovekey_1w = {INIT_HF_COORD, 0,              KEY_1w}; -act7 ahchase1_1w = {INIT_HF_COORD, 5 * NORMAL_TPS, DOG_1w}; -act7 akchase1_1w = {INIT_HF_COORD, 5 * NORMAL_TPS, DOG_1w}; +act7 amovekey_1w = {INIT_HF_COORD, 0,                  KEY_1w}; +act7 ahchase1_1w = {INIT_HF_COORD, 5 * NORMAL_TPS_v2d, DOG_1w}; +act7 akchase1_1w = {INIT_HF_COORD, 5 * NORMAL_TPS_v2d, DOG_1w};  // Those two actions were defined as act11 with a type set to INIT_HF_COORD -act7 adog3_1w    = {INIT_HF_COORD, 0,              DOG_1w}; -act7 alab1_1w    = {INIT_HF_COORD, 0,              PROF_1w}; - -act8 ascr01_1w   = {NEW_SCREEN, 0,               1}; -act8 ascr12_1w   = {NEW_SCREEN, 12,              2}; -act8 ascr14_1w   = {NEW_SCREEN, 12,              4}; -act8 ascr10_1w   = {NEW_SCREEN, 0,               0}; -act8 ascr13_1w   = {NEW_SCREEN, 0,               3}; -act8 ascr15_1w   = {NEW_SCREEN, 0,               5}; -act8 ascr115_1w  = {NEW_SCREEN, 1,               15}; -act8 ascr21_1w   = {NEW_SCREEN, 0,               1}; -act8 ascr31_1w   = {NEW_SCREEN, 0,               1}; -act8 ascr35_1w   = {NEW_SCREEN, 0,               5}; -act8 ascr41_1w   = {NEW_SCREEN, 0,               1}; -act8 ascr51_1w   = {NEW_SCREEN, 0,               1}; -act8 ascr53_1w   = {NEW_SCREEN, 0,               3}; -act8 ascr56_1w   = {NEW_SCREEN, 0,               6}; -act8 ascr57_1w   = {NEW_SCREEN, 0,               7}; -act8 ascr65_1w   = {NEW_SCREEN, 0,               5}; -act8 ascr75_1w   = {NEW_SCREEN, 0,               5}; -act8 aopen78_1w  = {NEW_SCREEN, NORMAL_TPS + 12, 8}; -act8 ascr89_1w   = {NEW_SCREEN, 0,               9}; -act8 ascr87_1w   = {NEW_SCREEN, 0,               7}; -act8 ascr910_1w  = {NEW_SCREEN, 0,               10}; -act8 ascr98_1w   = {NEW_SCREEN, 0,               8}; -act8 ascr109_1w  = {NEW_SCREEN, 0,               9}; -act8 ascr1011_1w = {NEW_SCREEN, 0,               11}; -act8 ascr1110_1w = {NEW_SCREEN, 0,               10}; -act8 ascr1112_1w = {NEW_SCREEN, 0,               12}; -act8 ascr1213_1w = {NEW_SCREEN, 0,               13}; -act8 atheend2_1w = {NEW_SCREEN, 5 * NORMAL_TPS,  14}; -act8 ascr1211_1w = {NEW_SCREEN, 0,               11}; -act8 ascr151_1w  = {NEW_SCREEN, 0,               1}; - -act9 ast12_1w       = {INIT_OBJSTATE, 12,              DOOR2_1w,   0}; -act9 ast14_1w       = {INIT_OBJSTATE, 12,              DOOR3_1w,   0}; -act9 ast01_1w       = {INIT_OBJSTATE, 0,               DOOR1_1w,   0}; -act9 adef8_1w       = {INIT_OBJSTATE, 0,               WHISTLE_1w, 1}; -act9 a115g_1w       = {INIT_OBJSTATE, 0,               MASK_1w,    0}; -act9 aopenwd2_1w    = {INIT_OBJSTATE, 0,               WDOORL_1w,  1}; -act9 aworn_1w       = {INIT_OBJSTATE, 0,               MASK_1w,    1}; -act9 aremoved_1w    = {INIT_OBJSTATE, 0,               MASK_1w,    0}; -act9 abut4a_1w      = {INIT_OBJSTATE, 0,               BUTLER_1w,  1}; -act9 abut7a_1w      = {INIT_OBJSTATE, 0,               BUTLER_1w,  1}; -act9 abut10_1w      = {INIT_OBJSTATE, 10 * NORMAL_TPS, BUTLER_1w,  0}; -act9 astatedoor4_1w = {INIT_OBJSTATE, 0,               DOOR4_1w,   1}; -act9 ashedoil2_1w   = {INIT_OBJSTATE, 0,               SHED_1w,    1}; -act9 ast78_1w       = {INIT_OBJSTATE, NORMAL_TPS + 12, TRAP_1w,    0}; -act9 ahin1_1w       = {INIT_OBJSTATE, 0,               HERO,       1}; -act9 ahout_1w       = {INIT_OBJSTATE, 0,               HERO,       0}; -act9 aboatmov_1w    = {INIT_OBJSTATE, 0,               BOAT_1w,    2}; -act9 aboatfar_1w    = {INIT_OBJSTATE, 107,             BOAT_1w,    1}; -act9 aboatnear_1w   = {INIT_OBJSTATE, 13,              BOAT_1w,    0}; -act9 aompass_1w     = {INIT_OBJSTATE, 0,               OLDMAN_1w,  1}; -act9 abox12_1w      = {INIT_OBJSTATE, 0,               GDOOR_1w,   1}; -act9 aigor33_1w     = {INIT_OBJSTATE, 0,               GDOOR_1w,   4}; -act9 aigor23_1w     = {INIT_OBJSTATE, 0,               GDOOR_1w,   3}; -act9 aigor14_1w     = {INIT_OBJSTATE, 0,               GDOOR_1w,   2}; - -act10 ahchase3_1w = {INIT_PATH, 5 * NORMAL_TPS, DOG_1w,    CHASE,  DX * 2, DY * 2}; -act10 akchase3_1w = {INIT_PATH, 5 * NORMAL_TPS, DOG_1w,    CHASE,  DX * 2, DY * 2}; -act10 adef2_1w    = {INIT_PATH, NORMAL_TPS,     BAT2_1w,   WANDER, DX,     DY}; -act10 adef3_1w    = {INIT_PATH, NORMAL_TPS,     BAT3_1w,   WANDER, DX,     DY}; -act10 adef4_1w    = {INIT_PATH, NORMAL_TPS,     BAT4_1w,   WANDER, DX,     DY}; -act10 adef5_1w    = {INIT_PATH, NORMAL_TPS,     BAT5_1w,   WANDER, DX,     DY}; -act10 abut2_1w    = {INIT_PATH, 8 * NORMAL_TPS, BUTLER_1w, CHASE,  DX - 2, DY - 2}; -act10 abut3_1w    = {INIT_PATH, 0,              HERO,      AUTO,   0,      0}; -act10 abut8_1w    = {INIT_PATH, 0,              BUTLER_1w, WANDER, DX - 2, DY - 2}; -act10 abut9_1w    = {INIT_PATH, 0,              HERO,      USER,   0,      0}; -act10 adog2_1w    = {INIT_PATH, 0,              DOG_1w,    CHASE,  DX * 2, DY * 2}; -act10 abata1a_1w  = {INIT_PATH, 0,              BAT2_1w,   CHASE,  DX * 2, DY * 2}; -act10 abata1b_1w  = {INIT_PATH, 7,              BAT2_1w,   WANDER, DX,     DY}; -act10 abata2a_1w  = {INIT_PATH, 0,              BAT3_1w,   CHASE,  DX * 2, DY * 2}; -act10 abata2b_1w  = {INIT_PATH, 6,              BAT3_1w,   WANDER, DX,     DY}; -act10 abata3a_1w  = {INIT_PATH, 0,              BAT4_1w,   CHASE,  DX * 2, DY * 2}; -act10 abata3b_1w  = {INIT_PATH, 5,              BAT4_1w,   WANDER, DX,     DY}; -act10 abata4a_1w  = {INIT_PATH, 0,              BAT5_1w,   CHASE,  DX * 2, DY * 2}; -act10 abata4b_1w  = {INIT_PATH, 4,              BAT5_1w,   WANDER, DX,     DY}; -act10 amum2_1w    = {INIT_PATH, 3 * NORMAL_TPS, MUMMY_1w,  CHASE,  DX * 2, DY * 2}; -act10 arock1_1w   = {INIT_PATH, 0,              HERO,      AUTO,   0,      0}; -act10 arock16_1w  = {INIT_PATH, 55,             HERO,      USER,   0,      0}; -act10 abin3_1w    = {INIT_PATH, 0,              HERO,      AUTO,   0,      0}; -act10 about3_1w   = {INIT_PATH, 0,              HERO,      USER,   0,      0}; -act10 ajail1_1w   = {INIT_PATH, 0,              HERO,      AUTO,   0,      0}; -act10 alab14_1w   = {INIT_PATH, 40,             IGOR_1w,   WANDER, DX,     0}; -act10 acyc1_1w    = {INIT_PATH, 0,              HERO,      QUIET,  0,      0}; -act10 acyc2_1w    = {INIT_PATH, 57,             HERO,      USER,   0,      0}; +act7 adog3_1w    = {INIT_HF_COORD, 0,                  DOG_1w}; +act7 alab1_1w    = {INIT_HF_COORD, 0,                  PROF_1w}; + +act8 ascr01_1w   = {NEW_SCREEN, 0,                   1}; +act8 ascr12_1w   = {NEW_SCREEN, 12,                  2}; +act8 ascr14_1w   = {NEW_SCREEN, 12,                  4}; +act8 ascr10_1w   = {NEW_SCREEN, 0,                   0}; +act8 ascr13_1w   = {NEW_SCREEN, 0,                   3}; +act8 ascr15_1w   = {NEW_SCREEN, 0,                   5}; +act8 ascr115_1w  = {NEW_SCREEN, 1,                   15}; +act8 ascr21_1w   = {NEW_SCREEN, 0,                   1}; +act8 ascr31_1w   = {NEW_SCREEN, 0,                   1}; +act8 ascr35_1w   = {NEW_SCREEN, 0,                   5}; +act8 ascr41_1w   = {NEW_SCREEN, 0,                   1}; +act8 ascr51_1w   = {NEW_SCREEN, 0,                   1}; +act8 ascr53_1w   = {NEW_SCREEN, 0,                   3}; +act8 ascr56_1w   = {NEW_SCREEN, 0,                   6}; +act8 ascr57_1w   = {NEW_SCREEN, 0,                   7}; +act8 ascr65_1w   = {NEW_SCREEN, 0,                   5}; +act8 ascr75_1w   = {NEW_SCREEN, 0,                   5}; +act8 aopen78_1w  = {NEW_SCREEN, NORMAL_TPS_v2d + 12, 8}; +act8 ascr89_1w   = {NEW_SCREEN, 0,                   9}; +act8 ascr87_1w   = {NEW_SCREEN, 0,                   7}; +act8 ascr910_1w  = {NEW_SCREEN, 0,                   10}; +act8 ascr98_1w   = {NEW_SCREEN, 0,                   8}; +act8 ascr109_1w  = {NEW_SCREEN, 0,                   9}; +act8 ascr1011_1w = {NEW_SCREEN, 0,                   11}; +act8 ascr1110_1w = {NEW_SCREEN, 0,                   10}; +act8 ascr1112_1w = {NEW_SCREEN, 0,                   12}; +act8 ascr1213_1w = {NEW_SCREEN, 0,                   13}; +act8 atheend2_1w = {NEW_SCREEN, 5 * NORMAL_TPS_v2d,  14}; +act8 ascr1211_1w = {NEW_SCREEN, 0,                   11}; +act8 ascr151_1w  = {NEW_SCREEN, 0,                   1}; + +act9 ast12_1w       = {INIT_OBJSTATE, 12,                  DOOR2_1w,   0}; +act9 ast14_1w       = {INIT_OBJSTATE, 12,                  DOOR3_1w,   0}; +act9 ast01_1w       = {INIT_OBJSTATE, 0,                   DOOR1_1w,   0}; +act9 adef8_1w       = {INIT_OBJSTATE, 0,                   WHISTLE_1w, 1}; +act9 a115g_1w       = {INIT_OBJSTATE, 0,                   MASK_1w,    0}; +act9 aopenwd2_1w    = {INIT_OBJSTATE, 0,                   WDOORL_1w,  1}; +act9 aworn_1w       = {INIT_OBJSTATE, 0,                   MASK_1w,    1}; +act9 aremoved_1w    = {INIT_OBJSTATE, 0,                   MASK_1w,    0}; +act9 abut4a_1w      = {INIT_OBJSTATE, 0,                   BUTLER_1w,  1}; +act9 abut7a_1w      = {INIT_OBJSTATE, 0,                   BUTLER_1w,  1}; +act9 abut10_1w      = {INIT_OBJSTATE, 10 * NORMAL_TPS_v2d, BUTLER_1w,  0}; +act9 astatedoor4_1w = {INIT_OBJSTATE, 0,                   DOOR4_1w,   1}; +act9 ashedoil2_1w   = {INIT_OBJSTATE, 0,                   SHED_1w,    1}; +act9 ast78_1w       = {INIT_OBJSTATE, NORMAL_TPS_v2d + 12, TRAP_1w,    0}; +act9 ahin1_1w       = {INIT_OBJSTATE, 0,                   HERO,       1}; +act9 ahout_1w       = {INIT_OBJSTATE, 0,                   HERO,       0}; +act9 aboatmov_1w    = {INIT_OBJSTATE, 0,                   BOAT_1w,    2}; +act9 aboatfar_1w    = {INIT_OBJSTATE, 107,                 BOAT_1w,    1}; +act9 aboatnear_1w   = {INIT_OBJSTATE, 13,                  BOAT_1w,    0}; +act9 aompass_1w     = {INIT_OBJSTATE, 0,                   OLDMAN_1w,  1}; +act9 abox12_1w      = {INIT_OBJSTATE, 0,                   GDOOR_1w,   1}; +act9 aigor33_1w     = {INIT_OBJSTATE, 0,                   GDOOR_1w,   4}; +act9 aigor23_1w     = {INIT_OBJSTATE, 0,                   GDOOR_1w,   3}; +act9 aigor14_1w     = {INIT_OBJSTATE, 0,                   GDOOR_1w,   2}; + +act10 ahchase3_1w = {INIT_PATH, 5 * NORMAL_TPS_v2d, DOG_1w,    CHASE,  DX * 2, DY * 2}; +act10 akchase3_1w = {INIT_PATH, 5 * NORMAL_TPS_v2d, DOG_1w,    CHASE,  DX * 2, DY * 2}; +act10 adef2_1w    = {INIT_PATH, NORMAL_TPS_v2d,     BAT2_1w,   WANDER, DX,     DY}; +act10 adef3_1w    = {INIT_PATH, NORMAL_TPS_v2d,     BAT3_1w,   WANDER, DX,     DY}; +act10 adef4_1w    = {INIT_PATH, NORMAL_TPS_v2d,     BAT4_1w,   WANDER, DX,     DY}; +act10 adef5_1w    = {INIT_PATH, NORMAL_TPS_v2d,     BAT5_1w,   WANDER, DX,     DY}; +act10 abut2_1w    = {INIT_PATH, 8 * NORMAL_TPS_v2d, BUTLER_1w, CHASE,  DX - 2, DY - 2}; +act10 abut3_1w    = {INIT_PATH, 0,                  HERO,      AUTO,   0,      0}; +act10 abut8_1w    = {INIT_PATH, 0,                  BUTLER_1w, WANDER, DX - 2, DY - 2}; +act10 abut9_1w    = {INIT_PATH, 0,                  HERO,      USER,   0,      0}; +act10 adog2_1w    = {INIT_PATH, 0,                  DOG_1w,    CHASE,  DX * 2, DY * 2}; +act10 abata1a_1w  = {INIT_PATH, 0,                  BAT2_1w,   CHASE,  DX * 2, DY * 2}; +act10 abata1b_1w  = {INIT_PATH, 7,                  BAT2_1w,   WANDER, DX,     DY}; +act10 abata2a_1w  = {INIT_PATH, 0,                  BAT3_1w,   CHASE,  DX * 2, DY * 2}; +act10 abata2b_1w  = {INIT_PATH, 6,                  BAT3_1w,   WANDER, DX,     DY}; +act10 abata3a_1w  = {INIT_PATH, 0,                  BAT4_1w,   CHASE,  DX * 2, DY * 2}; +act10 abata3b_1w  = {INIT_PATH, 5,                  BAT4_1w,   WANDER, DX,     DY}; +act10 abata4a_1w  = {INIT_PATH, 0,                  BAT5_1w,   CHASE,  DX * 2, DY * 2}; +act10 abata4b_1w  = {INIT_PATH, 4,                  BAT5_1w,   WANDER, DX,     DY}; +act10 amum2_1w    = {INIT_PATH, 3 * NORMAL_TPS_v2d, MUMMY_1w,  CHASE,  DX * 2, DY * 2}; +act10 arock1_1w   = {INIT_PATH, 0,                  HERO,      AUTO,   0,      0}; +act10 arock16_1w  = {INIT_PATH, 55,                 HERO,      USER,   0,      0}; +act10 abin3_1w    = {INIT_PATH, 0,                  HERO,      AUTO,   0,      0}; +act10 about3_1w   = {INIT_PATH, 0,                  HERO,      USER,   0,      0}; +act10 ajail1_1w   = {INIT_PATH, 0,                  HERO,      AUTO,   0,      0}; +act10 alab14_1w   = {INIT_PATH, 40,                 IGOR_1w,   WANDER, DX,     0}; +act10 acyc1_1w    = {INIT_PATH, 0,                  HERO,      QUIET,  0,      0}; +act10 acyc2_1w    = {INIT_PATH, 57,                 HERO,      USER,   0,      0};  act11 atcup2_1w        = {COND_R,        0,   CUPBOARD_1w, 2, kALcuptxt2_1w,    kALcuptxt3_1w};  act11 atcup1_1w        = {COND_R,        0,   CUPBOARD_1w, 1, kALcuptxt1_1w,    kALlookcupb2_1w}; @@ -6040,93 +6042,93 @@ act11 aichk2_1w        = {COND_R,        0,   GDOOR_1w,    2, kALigor2_1w,  act11 aichk1_1w        = {COND_R,        0,   GDOOR_1w,    1, kALigor1_1w,      kALichk2_1w};  act11 aichk0_1w        = {COND_R,        0,   GDOOR_1w,    0, kALigor0_1w,      kALichk1_1w}; -act12 apbreak_1w     = {TEXT, 0,                  kSTspbreak_1w}; -act12 acuptxt0_1w    = {TEXT, 0,                  kSTsseepkdw_1w}; -act12 acuptxt1_1w    = {TEXT, 0,                  kSTsseedw_1w}; -act12 acuptxt2_1w    = {TEXT, 0,                  kSTsseepk_1w}; -act12 acuptxt3_1w    = {TEXT, 0,                  kSTesnosee_1w}; -act12 adwwhy_1w      = {TEXT, 0,                  kSTsWonder_1w}; -act12 ablowt_1w      = {TEXT, 3 * NORMAL_TPS,     kSTsBlowWhistle_1w}; -act12 adef6_1w       = {TEXT, NORMAL_TPS,         kSTsdefbat1_1w}; -act12 adef7_1w       = {TEXT, 3 * NORMAL_TPS,     kSTsdefbat2_1w}; -act12 anought_1w     = {TEXT, NORMAL_TPS,         kSTsNothing_1w}; -act12 a115e_1w       = {TEXT, 0,                  kSTsDropMask_1w}; -act12 aweartext_1w   = {TEXT, 0,                  kSTWearMask_1w}; -act12 aremovetext_1w = {TEXT, 0,                  kSTRemoveMask_1w}; -act12 abut6a_1w      = {TEXT, 0,                  kSTsButSniff_1w}; -act12 abut6b_1w      = {TEXT, 3,                  kSTsButChop_1w}; -act12 abut6c_1w      = {TEXT, 6,                  kSTsButHead_1w}; -act12 abut9a_1w      = {TEXT, NORMAL_TPS / 3,     kSTsButEnjoy_1w}; -act12 abut9b_1w      = {TEXT, NORMAL_TPS / 3 + 1, kSTsButTake_1w}; -act12 abut11_1w      = {TEXT, NORMAL_TPS / 3,     kSTsButLater_1w}; -act12 aeatchop_1w    = {TEXT, 0,                  kSTsEatChop_1w}; -act12 achopfail_1w   = {TEXT, 0,                  kSTesthrown_1w}; -act12 achopthrown_1w = {TEXT, 5 * NORMAL_TPS,     kSTsDogEat_1w}; -act12 atalk1a_1w     = {TEXT, 0,                  kSTAskFrank_1w}; -act12 atalk1b_1w     = {TEXT, 0,                  kSTRepFrank_1w}; -act12 atalk2a_1w     = {TEXT, 0,                  kSTAskDrac_1w}; -act12 atalk2b_1w     = {TEXT, 0,                  kSTRepDrac_1w}; -act12 atalk3a_1w     = {TEXT, 0,                  kSTAskGwen_1w}; -act12 atalk3b_1w     = {TEXT, 0,                  kSTRepGwen_1w}; -act12 atalk4a_1w     = {TEXT, 0,                  kSTAskFriar_1w}; -act12 atalk4b_1w     = {TEXT, 0,                  kSTRepFriar_1w}; -act12 atalk5a_1w     = {TEXT, 0,                  kSTAskSlime_1w}; -act12 atalk5b_1w     = {TEXT, 0,                  kSTRepSlime_1w}; -act12 atalk6a_1w     = {TEXT, 0,                  kSTAskPea_1w}; -act12 atalk6b_1w     = {TEXT, 0,                  kSTRepPea_1w}; -act12 anoopen_1w     = {TEXT, 0,                  kSTsWrongCombo_1w}; -act12 aopen4_1w      = {TEXT, 0,                  kSTsRightCombo_1w}; -act12 ashedoil1_1w   = {TEXT, 0,                  kSTsTakeOil_1w}; -act12 adoggy_1w      = {TEXT, 0,                  kSTsDogEatHero_1w}; -act12 at78a_1w       = {TEXT, 0,                  kSTsTossMask_1w}; -act12 aopenfail_1w   = {TEXT, 0,                  kSTsTrapBolted_1w}; -act12 ahelps1_1w     = {TEXT, 0,                  kSTsBaseHelp1_1w}; -act12 anohelp_1w     = {TEXT, 0,                  kSTsNoHelp_1w}; -act12 ahelps2_1w     = {TEXT, 0,                  kSTsBaseHelp2_1w}; -act12 abat5a_1w      = {TEXT, 0,                  kSTsGotcher_1w}; -act12 abat5b_1w      = {TEXT, 0,                  kSTsBatGot_1w}; -act12 amum3_1w       = {TEXT, 0,                  kSTsGotcher_1w}; -act12 amum4_1w       = {TEXT, 0,                  kSTsMummyGot_1w}; -act12 abin0_1w       = {TEXT, 0,                  kSTsEnterBoat_1w}; -act12 abung1_1w      = {TEXT, 0,                  kSTsBoatHole_1w}; -act12 ahout1_1w      = {TEXT, 0,                  kSTsExitBoat_1w}; -act12 anodeboat_1w   = {TEXT, 0,                  kSTsManBlock_1w}; -act12 amoving_1w     = {TEXT, 0,                  kSTsShutup_1w}; -act12 anotcut_1w     = {TEXT, 0,                  kSTsBoatTied_1w}; -act12 arepyep_1w     = {TEXT, 0,                  kSTsCorrect_1w}; -act12 arepnop_1w     = {TEXT, 0,                  kSTsIncorrect_1w}; -act12 amans1_1w      = {TEXT, 0,                  kSTsDoomed1_1w}; -act12 arepno5_1w     = {TEXT, 0,                  kSTsDoomed2_1w}; -act12 arepyep2_1w    = {TEXT, 0,                  kSTsContinue_1w}; -act12 amans3_1w      = {TEXT, 0,                  kSTsOldMan1_1w}; -act12 amans4_1w      = {TEXT, 0,                  kSTsOldMan2_1w}; -act12 amans5_1w      = {TEXT, 0,                  kSTsOldMan3_1w}; -act12 amans6_1w      = {TEXT, 0,                  kSTsOldMan4_1w}; -act12 amans7_1w      = {TEXT, 0,                  kSTsOldMan5_1w}; -act12 ajails1_1w     = {TEXT, 0,                  kSTsCongrats_1w}; -act12 ajails2_1w     = {TEXT, 0,                  kSTsRescued1_1w}; -act12 ajails3_1w     = {TEXT, 0,                  kSTsRescued2_1w}; -act12 ajails4_1w     = {TEXT, 0,                  kSTsRescued3_1w}; -act12 agive1_1w      = {TEXT, 0,                  kSTsGuard1_1w}; -act12 agive2_1w      = {TEXT, 0,                  kSTsGuard2_1w}; -act12 anogive_1w     = {TEXT, 0,                  kSTsNoGive_1w}; -act12 bye1_1w        = {TEXT, 2 * NORMAL_TPS,     kSTsKissy_1w}; -act12 bye2_1w        = {TEXT, 3 * NORMAL_TPS,     kSTsGoodbye_1w}; -act12 admsg3_1w      = {TEXT, 0,                  kSTsGrip_1w}; -act12 admsg2_1w      = {TEXT, 0,                  kSTsCoordinate_1w}; -act12 admsg1_1w      = {TEXT, 0,                  kSTsReach_1w}; -act12 alab12_1w      = {TEXT, 24,                 kSTsProf1_1w}; -act12 alab13_1w      = {TEXT, 24,                 kSTsProf2_1w}; -act12 abox2_1w       = {TEXT, 16,                 kSTsProf3_1w}; -act12 abox3_1w       = {TEXT, 16,                 kSTsIgorRed_1w}; -act12 abox5_1w       = {TEXT, 38,                 kSTsProfUpset_1w}; -act12 abox6_1w       = {TEXT, 44,                 kSTsProfRetires_1w}; -act12 ainorm_1w      = {TEXT, 0,                  kSTsIgorRefuses_1w}; -act12 aigor22_1w     = {TEXT, 0,                  kSTsIgorGreen_1w}; -act12 aigor13_1w     = {TEXT, 0,                  kSTsIgorYellow_1w}; -act12 aigor32_1w     = {TEXT, 0,                  kSTsIgorBlue_1w}; -act12 aigor0_1w      = {TEXT, 0,                  kSTsIgorNo_1w}; -act12 agobox_1w      = {TEXT, 0,                  kSTsIgorBox_1w}; +act12 apbreak_1w     = {TEXT, 0,                      kSTspbreak_1w}; +act12 acuptxt0_1w    = {TEXT, 0,                      kSTsseepkdw_1w}; +act12 acuptxt1_1w    = {TEXT, 0,                      kSTsseedw_1w}; +act12 acuptxt2_1w    = {TEXT, 0,                      kSTsseepk_1w}; +act12 acuptxt3_1w    = {TEXT, 0,                      kSTesnosee_1w}; +act12 adwwhy_1w      = {TEXT, 0,                      kSTsWonder_1w}; +act12 ablowt_1w      = {TEXT, 3 * NORMAL_TPS_v2d,     kSTsBlowWhistle_1w}; +act12 adef6_1w       = {TEXT, NORMAL_TPS_v2d,         kSTsdefbat1_1w}; +act12 adef7_1w       = {TEXT, 3 * NORMAL_TPS_v2d,     kSTsdefbat2_1w}; +act12 anought_1w     = {TEXT, NORMAL_TPS_v2d,         kSTsNothing_1w}; +act12 a115e_1w       = {TEXT, 0,                      kSTsDropMask_1w}; +act12 aweartext_1w   = {TEXT, 0,                      kSTWearMask_1w}; +act12 aremovetext_1w = {TEXT, 0,                      kSTRemoveMask_1w}; +act12 abut6a_1w      = {TEXT, 0,                      kSTsButSniff_1w}; +act12 abut6b_1w      = {TEXT, 3,                      kSTsButChop_1w}; +act12 abut6c_1w      = {TEXT, 6,                      kSTsButHead_1w}; +act12 abut9a_1w      = {TEXT, NORMAL_TPS_v2d / 3,     kSTsButEnjoy_1w}; +act12 abut9b_1w      = {TEXT, NORMAL_TPS_v2d / 3 + 1, kSTsButTake_1w}; +act12 abut11_1w      = {TEXT, NORMAL_TPS_v2d / 3,     kSTsButLater_1w}; +act12 aeatchop_1w    = {TEXT, 0,                      kSTsEatChop_1w}; +act12 achopfail_1w   = {TEXT, 0,                      kSTesthrown_1w}; +act12 achopthrown_1w = {TEXT, 5 * NORMAL_TPS_v2d,     kSTsDogEat_1w}; +act12 atalk1a_1w     = {TEXT, 0,                      kSTAskFrank_1w}; +act12 atalk1b_1w     = {TEXT, 0,                      kSTRepFrank_1w}; +act12 atalk2a_1w     = {TEXT, 0,                      kSTAskDrac_1w}; +act12 atalk2b_1w     = {TEXT, 0,                      kSTRepDrac_1w}; +act12 atalk3a_1w     = {TEXT, 0,                      kSTAskGwen_1w}; +act12 atalk3b_1w     = {TEXT, 0,                      kSTRepGwen_1w}; +act12 atalk4a_1w     = {TEXT, 0,                      kSTAskFriar_1w}; +act12 atalk4b_1w     = {TEXT, 0,                      kSTRepFriar_1w}; +act12 atalk5a_1w     = {TEXT, 0,                      kSTAskSlime_1w}; +act12 atalk5b_1w     = {TEXT, 0,                      kSTRepSlime_1w}; +act12 atalk6a_1w     = {TEXT, 0,                      kSTAskPea_1w}; +act12 atalk6b_1w     = {TEXT, 0,                      kSTRepPea_1w}; +act12 anoopen_1w     = {TEXT, 0,                      kSTsWrongCombo_1w}; +act12 aopen4_1w      = {TEXT, 0,                      kSTsRightCombo_1w}; +act12 ashedoil1_1w   = {TEXT, 0,                      kSTsTakeOil_1w}; +act12 adoggy_1w      = {TEXT, 0,                      kSTsDogEatHero_1w}; +act12 at78a_1w       = {TEXT, 0,                      kSTsTossMask_1w}; +act12 aopenfail_1w   = {TEXT, 0,                      kSTsTrapBolted_1w}; +act12 ahelps1_1w     = {TEXT, 0,                      kSTsBaseHelp1_1w}; +act12 anohelp_1w     = {TEXT, 0,                      kSTsNoHelp_1w}; +act12 ahelps2_1w     = {TEXT, 0,                      kSTsBaseHelp2_1w}; +act12 abat5a_1w      = {TEXT, 0,                      kSTsGotcher_1w}; +act12 abat5b_1w      = {TEXT, 0,                      kSTsBatGot_1w}; +act12 amum3_1w       = {TEXT, 0,                      kSTsGotcher_1w}; +act12 amum4_1w       = {TEXT, 0,                      kSTsMummyGot_1w}; +act12 abin0_1w       = {TEXT, 0,                      kSTsEnterBoat_1w}; +act12 abung1_1w      = {TEXT, 0,                      kSTsBoatHole_1w}; +act12 ahout1_1w      = {TEXT, 0,                      kSTsExitBoat_1w}; +act12 anodeboat_1w   = {TEXT, 0,                      kSTsManBlock_1w}; +act12 amoving_1w     = {TEXT, 0,                      kSTsShutup_1w}; +act12 anotcut_1w     = {TEXT, 0,                      kSTsBoatTied_1w}; +act12 arepyep_1w     = {TEXT, 0,                      kSTsCorrect_1w}; +act12 arepnop_1w     = {TEXT, 0,                      kSTsIncorrect_1w}; +act12 amans1_1w      = {TEXT, 0,                      kSTsDoomed1_1w}; +act12 arepno5_1w     = {TEXT, 0,                      kSTsDoomed2_1w}; +act12 arepyep2_1w    = {TEXT, 0,                      kSTsContinue_1w}; +act12 amans3_1w      = {TEXT, 0,                      kSTsOldMan1_1w}; +act12 amans4_1w      = {TEXT, 0,                      kSTsOldMan2_1w}; +act12 amans5_1w      = {TEXT, 0,                      kSTsOldMan3_1w}; +act12 amans6_1w      = {TEXT, 0,                      kSTsOldMan4_1w}; +act12 amans7_1w      = {TEXT, 0,                      kSTsOldMan5_1w}; +act12 ajails1_1w     = {TEXT, 0,                      kSTsCongrats_1w}; +act12 ajails2_1w     = {TEXT, 0,                      kSTsRescued1_1w}; +act12 ajails3_1w     = {TEXT, 0,                      kSTsRescued2_1w}; +act12 ajails4_1w     = {TEXT, 0,                      kSTsRescued3_1w}; +act12 agive1_1w      = {TEXT, 0,                      kSTsGuard1_1w}; +act12 agive2_1w      = {TEXT, 0,                      kSTsGuard2_1w}; +act12 anogive_1w     = {TEXT, 0,                      kSTsNoGive_1w}; +act12 bye1_1w        = {TEXT, 2 * NORMAL_TPS_v2d,     kSTsKissy_1w}; +act12 bye2_1w        = {TEXT, 3 * NORMAL_TPS_v2d,     kSTsGoodbye_1w}; +act12 admsg3_1w      = {TEXT, 0,                      kSTsGrip_1w}; +act12 admsg2_1w      = {TEXT, 0,                      kSTsCoordinate_1w}; +act12 admsg1_1w      = {TEXT, 0,                      kSTsReach_1w}; +act12 alab12_1w      = {TEXT, 24,                     kSTsProf1_1w}; +act12 alab13_1w      = {TEXT, 24,                     kSTsProf2_1w}; +act12 abox2_1w       = {TEXT, 16,                     kSTsProf3_1w}; +act12 abox3_1w       = {TEXT, 16,                     kSTsIgorRed_1w}; +act12 abox5_1w       = {TEXT, 38,                     kSTsProfUpset_1w}; +act12 abox6_1w       = {TEXT, 44,                     kSTsProfRetires_1w}; +act12 ainorm_1w      = {TEXT, 0,                      kSTsIgorRefuses_1w}; +act12 aigor22_1w     = {TEXT, 0,                      kSTsIgorGreen_1w}; +act12 aigor13_1w     = {TEXT, 0,                      kSTsIgorYellow_1w}; +act12 aigor32_1w     = {TEXT, 0,                      kSTsIgorBlue_1w}; +act12 aigor0_1w      = {TEXT, 0,                      kSTsIgorNo_1w}; +act12 agobox_1w      = {TEXT, 0,                      kSTsIgorBox_1w};  act13 aswapmask_1w = {SWAP_IMAGES, 0,  HERO, MONKEY_1w};  act13 aswaphero_1w = {SWAP_IMAGES, 0,  HERO, WHERO_1w}; @@ -6147,40 +6149,40 @@ act14 achkscr_1w    = {COND_SCR, 0, HERO, 12, kALgive_1w,      kALnogive_1w};  act15 adogchop_1w = {AUTOPILOT, 0, DOG_1w, CHOP_1w, DX + 2, DY * 2}; -act16 aclosedoor2_1w = {INIT_OBJ_SEQ, 12,              DOOR2_1w, 0}; -act16 aclosedoor3_1w = {INIT_OBJ_SEQ, 12,              DOOR3_1w, 0}; -act16 adogseq_1w     = {INIT_OBJ_SEQ, 0,               DOG_1w,   1}; -act16 adogseq2_1w    = {INIT_OBJ_SEQ, 4 * NORMAL_TPS,  DOG_1w,   2}; -act16 adog5_1w       = {INIT_OBJ_SEQ, 0,               DOG_1w,   0}; -act16 at78c_1w       = {INIT_OBJ_SEQ, NORMAL_TPS + 12, TRAP_1w,  0}; -act16 arock3_1w      = {INIT_OBJ_SEQ, 0,               HERO,     RIGHT}; -act16 arock5_1w      = {INIT_OBJ_SEQ, 11,              HERO,     _UP}; -act16 arock10_1w     = {INIT_OBJ_SEQ, 40,              HERO,     _UP}; -act16 arock12_1w     = {INIT_OBJ_SEQ, 44,              HERO,     DOWN}; -act16 acutrope_1w    = {INIT_OBJ_SEQ, 0,               ROPE_1w,  1}; -act16 abin1_1w       = {INIT_OBJ_SEQ, 0,               BOAT_1w,  1}; -act16 about1_1w      = {INIT_OBJ_SEQ, 0,               BOAT_1w,  0}; -act16 ajail3_1w      = {INIT_OBJ_SEQ, 0,               HERO,     0}; -act16 ajail4_1w      = {INIT_OBJ_SEQ, 2,               HERO,     1}; -act16 aguardgo3_1w   = {INIT_OBJ_SEQ, 0,               GUARD_1w, 1}; -act16 aturnguard_1w  = {INIT_OBJ_SEQ, 2 * NORMAL_TPS,  GUARD_1w, 0}; -act16 alab4_1w       = {INIT_OBJ_SEQ, 0,               PROF_1w,  0}; -act16 alab10_1w      = {INIT_OBJ_SEQ, 14,              PROF_1w,  1}; -act16 alab11_1w      = {INIT_OBJ_SEQ, 18,              IGOR_1w,  1}; +act16 aclosedoor2_1w = {INIT_OBJ_SEQ, 12,                  DOOR2_1w, 0}; +act16 aclosedoor3_1w = {INIT_OBJ_SEQ, 12,                  DOOR3_1w, 0}; +act16 adogseq_1w     = {INIT_OBJ_SEQ, 0,                   DOG_1w,   1}; +act16 adogseq2_1w    = {INIT_OBJ_SEQ, 4 * NORMAL_TPS_v2d,  DOG_1w,   2}; +act16 adog5_1w       = {INIT_OBJ_SEQ, 0,                   DOG_1w,   0}; +act16 at78c_1w       = {INIT_OBJ_SEQ, NORMAL_TPS_v2d + 12, TRAP_1w,  0}; +act16 arock3_1w      = {INIT_OBJ_SEQ, 0,                   HERO,     RIGHT}; +act16 arock5_1w      = {INIT_OBJ_SEQ, 11,                  HERO,     _UP}; +act16 arock10_1w     = {INIT_OBJ_SEQ, 40,                  HERO,     _UP}; +act16 arock12_1w     = {INIT_OBJ_SEQ, 44,                  HERO,     DOWN}; +act16 acutrope_1w    = {INIT_OBJ_SEQ, 0,                   ROPE_1w,  1}; +act16 abin1_1w       = {INIT_OBJ_SEQ, 0,                   BOAT_1w,  1}; +act16 about1_1w      = {INIT_OBJ_SEQ, 0,                   BOAT_1w,  0}; +act16 ajail3_1w      = {INIT_OBJ_SEQ, 0,                   HERO,     0}; +act16 ajail4_1w      = {INIT_OBJ_SEQ, 2,                   HERO,     1}; +act16 aguardgo3_1w   = {INIT_OBJ_SEQ, 0,                   GUARD_1w, 1}; +act16 aturnguard_1w  = {INIT_OBJ_SEQ, 2 * NORMAL_TPS_v2d,  GUARD_1w, 0}; +act16 alab4_1w       = {INIT_OBJ_SEQ, 0,                   PROF_1w,  0}; +act16 alab10_1w      = {INIT_OBJ_SEQ, 14,                  PROF_1w,  1}; +act16 alab11_1w      = {INIT_OBJ_SEQ, 18,                  IGOR_1w,  1};  act17 acupbpk_1w = {SET_STATE_BITS, 0, CUPBOARD_1w, 1};  act17 acupbdw_1w = {SET_STATE_BITS, 0, CUPBOARD_1w, 2}; -act20 adef1_1w = {DEL_EVENTS, 1 * NORMAL_TPS, ASCHEDULE}; +act20 adef1_1w = {DEL_EVENTS, 1 * NORMAL_TPS_v2d, ASCHEDULE};  act21 abut6g_1w = {GAMEOVER, 7};  act21 adead5_1w = {GAMEOVER, 0};  // Those two were act7, with a type set to INIT_HH_COORD -act22 abut6e_1w   = {INIT_HH_COORD, 7,              HDLSHERO_1w}; -act22 adead2_1w   = {INIT_HH_COORD, 0,              HERODEAD_1w}; +act22 abut6e_1w   = {INIT_HH_COORD, 7, HDLSHERO_1w}; +act22 adead2_1w   = {INIT_HH_COORD, 0, HERODEAD_1w}; -act23 bye3_1w = {EXIT, 4 * NORMAL_TPS}; +act23 bye3_1w = {EXIT, 4 * NORMAL_TPS_v2d};  act24 abonus12_1w   = {BONUS, 0, 12};  act24 abonus1_1w    = {BONUS, 0, 1}; @@ -6196,26 +6198,26 @@ act24 abonus8_1w    = {BONUS, 0, 8};  // The following was defined as a act27 with a type set to BONUS  act24 abut7b_1w    = {BONUS,  0, 10}; -act25 achkdoor_1w = {COND_BOX, 2 * NORMAL_TPS, HERO, 25,  173, 40,  175, kALgoinside_1w, 0}; -act25 achkbbox_1w = {COND_BOX, 0,              HERO, 100, 153, 144, 160, kALbbox_1w,     0}; -act25 aichkbox_1w = {COND_BOX, 0,              HERO, 100, 153, 144, 163, kALichk0_1w,    kALgobox_1w}; - -act26 acreak_1w    = {SOUND, 0,              DOOR_CREAK_1w}; -act26 abatsnd_1w   = {SOUND, 50,             BAT_FLUTTER_1w}; -act26 adooropen_1w = {SOUND, 0,              DOOR_OPEN_1w}; -act26 ahchase4_1w  = {SOUND, 5 * NORMAL_TPS, DOG_BARK_1w}; -act26 abutsnd_1w   = {SOUND, 3,              BUTLER_GOTCHER_1w}; -act26 abut6h_1w    = {SOUND, 7,              T_TRACK10}; -act26 amunch_1w    = {SOUND, 0,              MUNCH_1w}; -act26 afork_1w     = {SOUND, 1 * NORMAL_TPS, FORK_BANG_1w}; -act26 asong3_1w    = {SOUND, 0,              DOG_BARK_1w}; -act26 afuneral_1w  = {SOUND, 0,              T_TRACK10}; -act26 abatgot_1w   = {SOUND, 0,              BAT_FLUTTER_1w}; -act26 asong2_1w    = {SOUND, 3 * NORMAL_TPS, MUMMY_CHASE_1w}; -act26 amumgot_1w   = {SOUND, 0,              MUMMY_GOTCHER_1w}; -act26 asplash_1w   = {SOUND, 0,              SPLASH_1w}; -act26 afinale_1w   = {SOUND, 0,              T_TRACK1}; -act26 abgsnd_1w    = {SOUND, 0,              MACHINE_NOISE_1w}; +act25 achkdoor_1w = {COND_BOX, 2 * NORMAL_TPS_v2d, HERO, 25,  173, 40,  175, kALgoinside_1w, 0}; +act25 achkbbox_1w = {COND_BOX, 0,                  HERO, 100, 153, 144, 160, kALbbox_1w,     0}; +act25 aichkbox_1w = {COND_BOX, 0,                  HERO, 100, 153, 144, 163, kALichk0_1w,    kALgobox_1w}; + +act26 acreak_1w    = {SOUND, 0,                  DOOR_CREAK_1w}; +act26 abatsnd_1w   = {SOUND, 50,                 BAT_FLUTTER_1w}; +act26 adooropen_1w = {SOUND, 0,                  DOOR_OPEN_1w}; +act26 ahchase4_1w  = {SOUND, 5 * NORMAL_TPS_v2d, DOG_BARK_1w}; +act26 abutsnd_1w   = {SOUND, 3,                  BUTLER_GOTCHER_1w}; +act26 abut6h_1w    = {SOUND, 7,                  T_TRACK10}; +act26 amunch_1w    = {SOUND, 0,                  MUNCH_1w}; +act26 afork_1w     = {SOUND, 1 * NORMAL_TPS_v2d, FORK_BANG_1w}; +act26 asong3_1w    = {SOUND, 0,                  DOG_BARK_1w}; +act26 afuneral_1w  = {SOUND, 0,                  T_TRACK10}; +act26 abatgot_1w   = {SOUND, 0,                  BAT_FLUTTER_1w}; +act26 asong2_1w    = {SOUND, 3 * NORMAL_TPS_v2d, MUMMY_CHASE_1w}; +act26 amumgot_1w   = {SOUND, 0,                  MUMMY_GOTCHER_1w}; +act26 asplash_1w   = {SOUND, 0,                  SPLASH_1w}; +act26 afinale_1w   = {SOUND, 0,                  T_TRACK1}; +act26 abgsnd_1w    = {SOUND, 0,                  MACHINE_NOISE_1w};  act27 ashedoil4_1w = {ADD_SCORE, 0, OILCAN_1w}; @@ -6224,11 +6226,11 @@ act28 a115f_1w = {SUB_SCORE, 0, MASK_1w};  act29 achkmask_1w  = {COND_CARRY, 0, MASK_1w, kALputmask_1w, 0};  act29 achkmask2_1w = {COND_CARRY, 0, MASK_1w, kALridmask_1w, 0}; -act43 abut4_1w       = {YESNO, 0,                   kSTsbut1_1w,       kALbutyes_1w,   kALbutno_1w}; -act43 achopprompt_1w = {YESNO, 0,                   kSTsChopPrompt_1w, kALeatchop_1w,  0}; -act43 ahelp1_1w      = {YESNO, 4 * 60 * NORMAL_TPS, kSTshelpp1_1w,     kALhelpy_1w,    kALhelpn_1w}; -act43 ahelp2_1w      = {YESNO, 5 * 60 * NORMAL_TPS, kSTshelpp2_1w,     kALhelpy2_1w,   kALhelpn_1w}; -act43 achkboat2_1w   = {YESNO, 0,                   kSTsBoatAsk_1w,    kALpushboat_1w, kALgetoutboat_1w}; +act43 abut4_1w       = {YESNO, 0,                       kSTsbut1_1w,       kALbutyes_1w,   kALbutno_1w}; +act43 achopprompt_1w = {YESNO, 0,                       kSTsChopPrompt_1w, kALeatchop_1w,  0}; +act43 ahelp1_1w      = {YESNO, 4 * 60 * NORMAL_TPS_v2d, kSTshelpp1_1w,     kALhelpy_1w,    kALhelpn_1w}; +act43 ahelp2_1w      = {YESNO, 5 * 60 * NORMAL_TPS_v2d, kSTshelpp2_1w,     kALhelpy2_1w,   kALhelpn_1w}; +act43 achkboat2_1w   = {YESNO, 0,                       kSTsBoatAsk_1w,    kALpushboat_1w, kALgetoutboat_1w};  act47 aviewfar_1w  = {INIT_VIEW, 107, BOAT_1w, 140, 55,  Common::KEYCODE_DOWN};  act47 aviewnear_1w = {INIT_VIEW, 13,  BOAT_1w, 250, 150, Common::KEYCODE_UP}; @@ -6452,15 +6454,15 @@ actList actListArr_1w[] = {  int dialrsp_2w[] = {kSTSdial2_2w, -1};  int whorsp_2w[] =  {kSTNobody_2w, kSTNo_one1_2w, kSTNo_one2_2w, kSTSharry_2w, -1}; -act0 arepchk_2w   = {ASCHEDULE, 4,                kALscr25_2w}; -act0 aclimax_2w   = {ASCHEDULE, 20,               kALclimax_2w}; -act0 aclue09_2w   = {ASCHEDULE, 200 * NORMAL_TPS, kALchkc09_2w}; -act0 ahdrink10_2w = {ASCHEDULE, 72,               kALhfaint_2w}; -act0 aschedbut_2w = {ASCHEDULE, 30,               kALschedbut_2w}; -act0 arepbuga_2w  = {ASCHEDULE, 3 * NORMAL_TPS,   kALbugrep1_2w}; -act0 arepbugf_2w  = {ASCHEDULE, 2 * NORMAL_TPS,   kALbugrep2_2w}; -act0 arepblah_2w  = {ASCHEDULE, 12 * NORMAL_TPS,  kALblah_2w}; -act0 arepmsg1_2w  = {ASCHEDULE, 120 * NORMAL_TPS, kALrepmsg1_2w}; +act0 arepchk_2w   = {ASCHEDULE, 4,                    kALscr25_2w}; +act0 aclimax_2w   = {ASCHEDULE, 20,                   kALclimax_2w}; +act0 aclue09_2w   = {ASCHEDULE, 200 * NORMAL_TPS_v2d, kALchkc09_2w}; +act0 ahdrink10_2w = {ASCHEDULE, 72,                   kALhfaint_2w}; +act0 aschedbut_2w = {ASCHEDULE, 30,                   kALschedbut_2w}; +act0 arepbuga_2w  = {ASCHEDULE, 3 * NORMAL_TPS_v2d,   kALbugrep1_2w}; +act0 arepbugf_2w  = {ASCHEDULE, 2 * NORMAL_TPS_v2d,   kALbugrep2_2w}; +act0 arepblah_2w  = {ASCHEDULE, 12 * NORMAL_TPS_v2d,  kALblah_2w}; +act0 arepmsg1_2w  = {ASCHEDULE, 120 * NORMAL_TPS_v2d, kALrepmsg1_2w};  act1 aback1_2w       = {START_OBJ, 0,             CAT_2w,       0, INVISIBLE};  act1 aback2_2w       = {START_OBJ, 2,             CAT_2w,       0, NOT_CYCLING}; @@ -6954,195 +6956,195 @@ act11 achkmaid_2w   = {COND_R, 0, MAID_2w,     0,    kALmaidx_2w,    kALblah_2w}  act11 achkstate0_2w = {COND_R, 0, BOOK_2w,     0,    kALhugone_2w,   kALchkstate1_2w};  act11 achkstate1_2w = {COND_R, 0, BOOK_2w,     1,    kALhole_2w,     kALpengone_2w}; -act12 alookbrg_2w  = {TEXT, 0,                   kSTLookBridge_2w}; -act12 astuck1_2w   = {TEXT, 0,                   kSTDoorStuck_2w}; -act12 atalkg_2w    = {TEXT, 0,                   kSTIgnore_2w}; -act12 aball4_2w    = {TEXT, 2,                   kSTBalloon1_2w}; -act12 aball5_2w    = {TEXT, 2,                   kSTBalloon2_2w}; -act12 aball6_2w    = {TEXT, 2,                   kSTBalloon3_2w}; -act12 abanana1_2w  = {TEXT, 0,                   kSTBanana1_2w}; -act12 abanana3_2w  = {TEXT, 0,                   kSTBanana2_2w}; -act12 abell_2w     = {TEXT, 0,                   kSTBell1_2w}; -act12 abell1_2w    = {TEXT, 8,                   kSTMaid7_2w}; -act12 abite2_2w    = {TEXT, 0,                   kSTSnake5_2w}; -act12 ablah_2w     = {TEXT, 8,                   kSTBlah_2w}; -act12 aboom_2w     = {TEXT, 0,                   kSTDyn4_2w}; -act12 acallp2_2w   = {TEXT, 0,                   kSTCall1_2w}; -act12 acallp3_2w   = {TEXT, 0,                   kSTCall2_2w}; -act12 acallp4_2w   = {TEXT, 0,                   kSTCall3_2w}; -act12 acallp5_2w   = {TEXT, 0,                   kSTCall4_2w}; -act12 acallp6_2w   = {TEXT, 0,                   kSTCall5_2w}; -act12 acallp7_2w   = {TEXT, 0,                   kSTCall6_2w}; -act12 acantpush_2w = {TEXT, 0,                   kSTPush1_2w}; -act12 acat1_2w     = {TEXT, 0,                   kSTCat3_2w}; -act12 acat4_2w     = {TEXT, 0,                   kSTMaid8_2w}; -act12 achasm1_2w   = {TEXT, 12,                  kSTChasm1_2w}; -act12 acheat1_2w   = {TEXT, 0,                   kSTScheat1_2w}; -act12 acheat2_2w   = {TEXT, 0,                   kSTScheat2_2w}; -act12 aclimax1_2w  = {TEXT, 0,                   kSTSclimax1_2w}; -act12 aclimax2_2w  = {TEXT, 8,                   kSTSclimax2_2w}; -act12 aclimax3_2w  = {TEXT, 80,                  kSTSclimax3_2w}; -act12 aclimax4_2w  = {TEXT, 80,                  kSTSclimax4_2w}; -act12 aclimax5_2w  = {TEXT, 80,                  kSTSclimax5_2w}; -act12 aclimax6_2w  = {TEXT, 80,                  kSTSclimax6_2w}; -act12 aclue09a_2w  = {TEXT, 0,                   kSTSclue09a_2w}; -act12 aclue09b_2w  = {TEXT, 0,                   kSTSclue09b_2w}; -act12 aclue09c_2w  = {TEXT, 0,                   kSTSclue09c_2w}; -act12 acomb1_2w    = {TEXT, 0,                   kSTScomb1_2w}; -act12 acomb2_2w    = {TEXT, 0,                   kSTScomb2_2w}; -act12 acook1_2w    = {TEXT, 8,                   kSTCook1_2w}; -act12 acook2_2w    = {TEXT, 8,                   kSTCook2_2w}; -act12 acook3_2w    = {TEXT, 8,                   kSTCook3_2w}; -act12 acook4_2w    = {TEXT, 24,                  kSTCook4_2w}; -act12 acook5_2w    = {TEXT, 24,                  kSTCook5_2w}; -act12 adialed_2w   = {TEXT, 0,                   kSTSdialed_2w}; -act12 adidnt1_2w   = {TEXT, 0,                   kSTSdidnt1_2w}; -act12 adidnt2_2w   = {TEXT, 0,                   kSTSdidnt2_2w}; -act12 adog1_2w     = {TEXT, 0,                   kSTDyn2_2w}; -act12 adone1_2w    = {TEXT, 10,                  kSTSdone1_2w}; -act12 adone13_2w   = {TEXT, 50,                  kSTSdone5_2w}; -act12 adone14_2w   = {TEXT, 50,                  kSTSdone6_2w}; -act12 adone15_2w   = {TEXT, 50,                  kSTSdone7_2w}; -act12 adone2_2w    = {TEXT, 10,                  kSTSdone2_2w}; -act12 adone3_2w    = {TEXT, 10,                  kSTSdone3_2w}; -act12 adone4_2w    = {TEXT, 10,                  kSTSdone4_2w}; -act12 adraught_2w  = {TEXT, 5 * 60 * NORMAL_TPS, kSTDraught_2w}; -act12 adropdyn2_2w = {TEXT, 0,                   kSTDyn3_2w}; -act12 adumb12_2w   = {TEXT, 0,                   kSTDumb2_2w}; -act12 adumb2_2w    = {TEXT, 0,                   kSTDumb1_2w}; -act12 adyn1_2w     = {TEXT, 0,                   kSTDyn1_2w}; -act12 aeatban_2w   = {TEXT, 0,                   kSTSeatbanana_2w}; -act12 aeatgarl1_2w = {TEXT, 0,                   kSTSgarl1_2w}; -act12 aeatgarl2_2w = {TEXT, 0,                   kSTSgarl2_2w}; -act12 aexplainb_2w = {TEXT, 0,                   kSTSexplainb_2w}; -act12 aext1_2w     = {TEXT, 0,                   kSTSrobot1_2w}; -act12 aext2_2w     = {TEXT, 0,                   kSTSrobot2_2w}; -act12 aext3_2w     = {TEXT, 0,                   kSTSrobot3_2w}; -act12 agard10_2w   = {TEXT, 300,                 kSTSgard6_2w}; -act12 agard5_2w    = {TEXT, 20,                  kSTSgard1_2w}; -act12 agard6_2w    = {TEXT, 30,                  kSTSgard2_2w}; -act12 agard7_2w    = {TEXT, 40,                  kSTSgard3_2w}; -act12 agard8_2w    = {TEXT, 90,                  kSTSgard4_2w}; -act12 agard9_2w    = {TEXT, 100,                 kSTSgard5_2w}; -act12 agenie1_2w   = {TEXT, 0,                   kSTRub2_2w}; -act12 agiveb3_2w   = {TEXT, 0,                   kSTCat2_2w}; -act12 aglook1_2w   = {TEXT, 0,                   kSTGardInShed_2w}; -act12 aglook2_2w   = {TEXT, 0,                   kSTGardShed_2w}; -act12 agotwill_2w  = {TEXT, 0,                   kSTGotWill_2w}; -act12 ahdrink11_2w = {TEXT, 82,                  kSTHest4_2w}; -act12 ahdrink12_2w = {TEXT, 84,                  kSTSay1_2w}; -act12 ahdrink13_2w = {TEXT, 84,                  kSTSay2_2w}; -act12 ahdrink2_2w  = {TEXT, 0,                   kSTHest1_2w}; -act12 ahdrink8_2w  = {TEXT, 72,                  kSTHest2_2w}; -act12 ahdrink9_2w  = {TEXT, 72,                  kSTHest3_2w}; -act12 ahest12_2w   = {TEXT, 8,                   kSTHest6_2w}; -act12 ahest13_2w   = {TEXT, 12,                  kSTHest7_2w}; -act12 ahest14_2w   = {TEXT, 16,                  kSTHest8_2w}; -act12 ahest15_2w   = {TEXT, 50,                  kSTHest9_2w}; -act12 ahestd2_2w   = {TEXT, 0,                   kSTHest5_2w}; -act12 ahnod1_2w    = {TEXT, 0,                   kSTNod1_2w}; -act12 ahnod2_2w    = {TEXT, 0,                   kSTSay1_2w}; -act12 ahnod3_2w    = {TEXT, 0,                   kSTSay2_2w}; -act12 akaboom1_2w  = {TEXT, 0,                   kSTDyn5_2w}; -act12 amat5_2w     = {TEXT, 0,                   kSTMatch4_2w}; -act12 amissed2_2w  = {TEXT, 0,                   kSTFire1_2w}; -act12 amissed3_2w  = {TEXT, 0,                   kSTFire2_2w}; -act12 amurd4_2w    = {TEXT, 10,                  kSTArgue1_2w}; -act12 anobang_2w   = {TEXT, 0,                   kSTDyn7_2w}; -act12 anobang2_2w  = {TEXT, 0,                   kSTDyn6_2w}; -act12 anobell_2w   = {TEXT, 8,                   kSTBell2_2w}; -act12 anogenie_2w  = {TEXT, 0,                   kSTRub1_2w}; -act12 anoreply_2w  = {TEXT, 0,                   kSTBrrr_2w}; -act12 anotrap_2w   = {TEXT, 0,                   kSTTrap1_2w}; -act12 aom1_2w      = {TEXT, 8,                   kSTSom1_2w}; -act12 aom10_2w     = {TEXT, 50,                  kSTSom4_2w}; -act12 aom11_2w     = {TEXT, 50,                  kSTSom5_2w}; -act12 aom12_2w     = {TEXT, 50,                  kSTSom6_2w}; -act12 aom13_2w     = {TEXT, 54,                  kSTSom7_2w}; -act12 aom14_2w     = {TEXT, 54,                  kSTSom8_2w}; -act12 aom5_2w      = {TEXT, 16,                  kSTSom2_2w}; -act12 aom6_2w      = {TEXT, 20,                  kSTSom3_2w}; -act12 aom9_2w      = {TEXT, 40,                  kSTSom3a_2w}; -act12 apen1_2w     = {TEXT, 0,                   kSTSpen1_2w}; -act12 apen2_2w     = {TEXT, 0,                   kSTSpen2_2w}; -act12 apen3_2w     = {TEXT, 0,                   kSTSpen3_2w}; -act12 aphoto4_2w   = {TEXT, 0,                   kSTSphoto_2w}; -act12 aphoto6_2w   = {TEXT, 0,                   kSTSphoto1_2w}; -act12 apois1_2w    = {TEXT, 0,                   kSTSnake1_2w}; -act12 apois2_2w    = {TEXT, 0,                   kSTSnake2_2w}; -act12 apois3_2w    = {TEXT, 0,                   kSTSnake3_2w}; -act12 apois4_2w    = {TEXT, 0,                   kSTSnake4_2w}; -act12 aridkey2_2w  = {TEXT, 0,                   kSTSridkey_2w}; -act12 arobot1_2w   = {TEXT, 0,                   kSTFire3_2w}; -act12 arok_2w      = {TEXT, 0,                   kSTWell1_2w}; -act12 arumbling_2w = {TEXT, 0,                   kSTRumble_2w}; -act12 arup_2w      = {TEXT, 0,                   kSTDyn8_2w}; -act12 asafe1_2w    = {TEXT, 0,                   kSTSsafe1_2w}; -act12 ascr31_2w    = {TEXT, 0,                   kSTLock1_2w}; -act12 aserum1_2w   = {TEXT, 0,                   kSTSserum1_2w}; -act12 aserum2_2w   = {TEXT, 0,                   kSTSserum2_2w}; -act12 asilly_2w    = {TEXT, 0,                   kSTDyn9_2w}; -act12 asniff_2w    = {TEXT, 0,                   kSTCat1_2w}; -act12 asoggy_2w    = {TEXT, 0,                   kSTMatch1_2w}; -act12 asonic1_2w   = {TEXT, 0,                   kSTSsonic1_2w}; -act12 asonic2_2w   = {TEXT, 0,                   kSTSsonic2_2w}; -act12 asonic3_2w   = {TEXT, 0,                   kSTSsonic3_2w}; -act12 asonic4_2w   = {TEXT, 0,                   kSTSsonic4_2w}; -act12 astick1_2w   = {TEXT, 0,                   kSTWeee_2w}; -act12 astrike_2w   = {TEXT, 0,                   kSTMatch2_2w}; -act12 astung_2w    = {TEXT, 0,                   kSTStung_2w}; -act12 awarn_2w     = {TEXT, 8,                   kSTSwarn_2w}; -act12 awarnz_2w    = {TEXT, 8,                   kSTSwarnz_2w}; -act12 awho1_2w     = {TEXT, 0,                   kSTTard1_2w}; -act12 awho2_2w     = {TEXT, 0,                   kSTTard2_2w}; -act12 awill1_2w    = {TEXT, 0,                   kSTSwill1_2w}; -act12 awill2_2w    = {TEXT, 0,                   kSTSwill2_2w}; -act12 awill3_2w    = {TEXT, 0,                   kSTSwill3_2w}; -act12 awill4_2w    = {TEXT, 0,                   kSTSwill4_2w}; -act12 abell2_2w    = {TEXT, 16,                  kSTMaid6_2w}; -act12 abug5a_2w    = {TEXT, 0,                   kSTStingeroo_2w}; -act12 abug5b_2w    = {TEXT, 0,                   kSTSbug5b_2w}; -act12 aclick_2w    = {TEXT, 0,                   kSTClick_2w}; -act12 aempty_2w    = {TEXT, 0,                   kSTEmpty_2w}; -act12 afaint1_2w   = {TEXT, 5,                   kSTSfaint1_2w}; -act12 afaint10_2w  = {TEXT, 35,                  kSTSfaint4_2w}; -act12 afaint5_2w   = {TEXT, 20,                  kSTSfaint2_2w}; -act12 afaint9_2w   = {TEXT, 35,                  kSTSfaint3_2w}; -act12 agone10_2w   = {TEXT, 115,                 kSTSgone6_2w}; -act12 agone11_2w   = {TEXT, 115,                 kSTSgone7_2w}; -act12 agone5_2w    = {TEXT, 0,                   kSTSgone1_2w}; -act12 agone6_2w    = {TEXT, 34,                  kSTSgone2_2w}; -act12 agone7_2w    = {TEXT, 70,                  kSTSgone3_2w}; -act12 agone8_2w    = {TEXT, 90,                  kSTSgone4_2w}; -act12 agone9_2w    = {TEXT, 115,                 kSTSgone5_2w}; -act12 aharry3_2w   = {TEXT, 4,                   kSTOrgan1_2w}; -act12 aharry4_2w   = {TEXT, 4,                   kSTOrgan2_2w}; -act12 aharry5_2w   = {TEXT, 4,                   kSTOrgan3_2w}; -act12 aharry7_2w   = {TEXT, 8,                   kSTOrgan4_2w}; -act12 ahole_2w     = {TEXT, 0,                   kSTFirst2_2w}; -act12 akeyhole1_2w = {TEXT, 0,                   kSTHole1_2w}; -act12 alie1_2w     = {TEXT, 13,                  kSTTired_2w}; -act12 alie2_2w     = {TEXT, 18,                  kSTTired2_2w}; -act12 amaid10_2w   = {TEXT, 90 * NORMAL_TPS,     kSTSmaid1_8_2w}; -act12 amaid11_2w   = {TEXT, 99 * NORMAL_TPS,     kSTSmaid1_9_2w}; -act12 amaid12_2w   = {TEXT, 0,                   kSTSmaid1_10_2w}; -act12 amaid3_2w    = {TEXT, 4,                   kSTSmaid1_1_2w}; -act12 amaid4_2w    = {TEXT, 17,                  kSTSmaid1_2_2w}; -act12 amaid5_2w    = {TEXT, 17,                  kSTSmaid1_3_2w}; -act12 amaid6_2w    = {TEXT, 17,                  kSTSmaid1_4_2w}; -act12 amaid7_2w    = {TEXT, 30,                  kSTSmaid1_5_2w}; -act12 amaid8_2w    = {TEXT, 30 * NORMAL_TPS,     kSTSmaid1_6_2w}; -act12 amaid9_2w    = {TEXT, 60 * NORMAL_TPS,     kSTSmaid1_7_2w}; -act12 amaidp3_2w   = {TEXT, 8,                   kSTMaid1_2w}; -act12 amaidp4_2w   = {TEXT, 8,                   kSTMaid2_2w}; -act12 amaidp5_2w   = {TEXT, 8,                   kSTMaid3_2w}; -act12 amaidp7_2w   = {TEXT, 12,                  kSTMaid4_2w}; -act12 amaidp8_2w   = {TEXT, 12,                  kSTMaid5_2w}; -act12 anocarry_2w  = {TEXT, 0,                   kSTNocarry_2w}; -act12 anopurps_2w  = {TEXT, 0,                   kSTNopurps_2w}; -act12 aok_2w       = {TEXT, 0,                   kSTOkgen_2w}; -act12 ascr21_2w    = {TEXT, 0,                   kSTSfirst_2w}; -act12 astory_2w    = {TEXT, STORYDELAY,          kSTStory_2w}; +act12 alookbrg_2w  = {TEXT, 0,                       kSTLookBridge_2w}; +act12 astuck1_2w   = {TEXT, 0,                       kSTDoorStuck_2w}; +act12 atalkg_2w    = {TEXT, 0,                       kSTIgnore_2w}; +act12 aball4_2w    = {TEXT, 2,                       kSTBalloon1_2w}; +act12 aball5_2w    = {TEXT, 2,                       kSTBalloon2_2w}; +act12 aball6_2w    = {TEXT, 2,                       kSTBalloon3_2w}; +act12 abanana1_2w  = {TEXT, 0,                       kSTBanana1_2w}; +act12 abanana3_2w  = {TEXT, 0,                       kSTBanana2_2w}; +act12 abell_2w     = {TEXT, 0,                       kSTBell1_2w}; +act12 abell1_2w    = {TEXT, 8,                       kSTMaid7_2w}; +act12 abite2_2w    = {TEXT, 0,                       kSTSnake5_2w}; +act12 ablah_2w     = {TEXT, 8,                       kSTBlah_2w}; +act12 aboom_2w     = {TEXT, 0,                       kSTDyn4_2w}; +act12 acallp2_2w   = {TEXT, 0,                       kSTCall1_2w}; +act12 acallp3_2w   = {TEXT, 0,                       kSTCall2_2w}; +act12 acallp4_2w   = {TEXT, 0,                       kSTCall3_2w}; +act12 acallp5_2w   = {TEXT, 0,                       kSTCall4_2w}; +act12 acallp6_2w   = {TEXT, 0,                       kSTCall5_2w}; +act12 acallp7_2w   = {TEXT, 0,                       kSTCall6_2w}; +act12 acantpush_2w = {TEXT, 0,                       kSTPush1_2w}; +act12 acat1_2w     = {TEXT, 0,                       kSTCat3_2w}; +act12 acat4_2w     = {TEXT, 0,                       kSTMaid8_2w}; +act12 achasm1_2w   = {TEXT, 12,                      kSTChasm1_2w}; +act12 acheat1_2w   = {TEXT, 0,                       kSTScheat1_2w}; +act12 acheat2_2w   = {TEXT, 0,                       kSTScheat2_2w}; +act12 aclimax1_2w  = {TEXT, 0,                       kSTSclimax1_2w}; +act12 aclimax2_2w  = {TEXT, 8,                       kSTSclimax2_2w}; +act12 aclimax3_2w  = {TEXT, 80,                      kSTSclimax3_2w}; +act12 aclimax4_2w  = {TEXT, 80,                      kSTSclimax4_2w}; +act12 aclimax5_2w  = {TEXT, 80,                      kSTSclimax5_2w}; +act12 aclimax6_2w  = {TEXT, 80,                      kSTSclimax6_2w}; +act12 aclue09a_2w  = {TEXT, 0,                       kSTSclue09a_2w}; +act12 aclue09b_2w  = {TEXT, 0,                       kSTSclue09b_2w}; +act12 aclue09c_2w  = {TEXT, 0,                       kSTSclue09c_2w}; +act12 acomb1_2w    = {TEXT, 0,                       kSTScomb1_2w}; +act12 acomb2_2w    = {TEXT, 0,                       kSTScomb2_2w}; +act12 acook1_2w    = {TEXT, 8,                       kSTCook1_2w}; +act12 acook2_2w    = {TEXT, 8,                       kSTCook2_2w}; +act12 acook3_2w    = {TEXT, 8,                       kSTCook3_2w}; +act12 acook4_2w    = {TEXT, 24,                      kSTCook4_2w}; +act12 acook5_2w    = {TEXT, 24,                      kSTCook5_2w}; +act12 adialed_2w   = {TEXT, 0,                       kSTSdialed_2w}; +act12 adidnt1_2w   = {TEXT, 0,                       kSTSdidnt1_2w}; +act12 adidnt2_2w   = {TEXT, 0,                       kSTSdidnt2_2w}; +act12 adog1_2w     = {TEXT, 0,                       kSTDyn2_2w}; +act12 adone1_2w    = {TEXT, 10,                      kSTSdone1_2w}; +act12 adone13_2w   = {TEXT, 50,                      kSTSdone5_2w}; +act12 adone14_2w   = {TEXT, 50,                      kSTSdone6_2w}; +act12 adone15_2w   = {TEXT, 50,                      kSTSdone7_2w}; +act12 adone2_2w    = {TEXT, 10,                      kSTSdone2_2w}; +act12 adone3_2w    = {TEXT, 10,                      kSTSdone3_2w}; +act12 adone4_2w    = {TEXT, 10,                      kSTSdone4_2w}; +act12 adraught_2w  = {TEXT, 5 * 60 * NORMAL_TPS_v2d, kSTDraught_2w}; +act12 adropdyn2_2w = {TEXT, 0,                       kSTDyn3_2w}; +act12 adumb12_2w   = {TEXT, 0,                       kSTDumb2_2w}; +act12 adumb2_2w    = {TEXT, 0,                       kSTDumb1_2w}; +act12 adyn1_2w     = {TEXT, 0,                       kSTDyn1_2w}; +act12 aeatban_2w   = {TEXT, 0,                       kSTSeatbanana_2w}; +act12 aeatgarl1_2w = {TEXT, 0,                       kSTSgarl1_2w}; +act12 aeatgarl2_2w = {TEXT, 0,                       kSTSgarl2_2w}; +act12 aexplainb_2w = {TEXT, 0,                       kSTSexplainb_2w}; +act12 aext1_2w     = {TEXT, 0,                       kSTSrobot1_2w}; +act12 aext2_2w     = {TEXT, 0,                       kSTSrobot2_2w}; +act12 aext3_2w     = {TEXT, 0,                       kSTSrobot3_2w}; +act12 agard10_2w   = {TEXT, 300,                     kSTSgard6_2w}; +act12 agard5_2w    = {TEXT, 20,                      kSTSgard1_2w}; +act12 agard6_2w    = {TEXT, 30,                      kSTSgard2_2w}; +act12 agard7_2w    = {TEXT, 40,                      kSTSgard3_2w}; +act12 agard8_2w    = {TEXT, 90,                      kSTSgard4_2w}; +act12 agard9_2w    = {TEXT, 100,                     kSTSgard5_2w}; +act12 agenie1_2w   = {TEXT, 0,                       kSTRub2_2w}; +act12 agiveb3_2w   = {TEXT, 0,                       kSTCat2_2w}; +act12 aglook1_2w   = {TEXT, 0,                       kSTGardInShed_2w}; +act12 aglook2_2w   = {TEXT, 0,                       kSTGardShed_2w}; +act12 agotwill_2w  = {TEXT, 0,                       kSTGotWill_2w}; +act12 ahdrink11_2w = {TEXT, 82,                      kSTHest4_2w}; +act12 ahdrink12_2w = {TEXT, 84,                      kSTSay1_2w}; +act12 ahdrink13_2w = {TEXT, 84,                      kSTSay2_2w}; +act12 ahdrink2_2w  = {TEXT, 0,                       kSTHest1_2w}; +act12 ahdrink8_2w  = {TEXT, 72,                      kSTHest2_2w}; +act12 ahdrink9_2w  = {TEXT, 72,                      kSTHest3_2w}; +act12 ahest12_2w   = {TEXT, 8,                       kSTHest6_2w}; +act12 ahest13_2w   = {TEXT, 12,                      kSTHest7_2w}; +act12 ahest14_2w   = {TEXT, 16,                      kSTHest8_2w}; +act12 ahest15_2w   = {TEXT, 50,                      kSTHest9_2w}; +act12 ahestd2_2w   = {TEXT, 0,                       kSTHest5_2w}; +act12 ahnod1_2w    = {TEXT, 0,                       kSTNod1_2w}; +act12 ahnod2_2w    = {TEXT, 0,                       kSTSay1_2w}; +act12 ahnod3_2w    = {TEXT, 0,                       kSTSay2_2w}; +act12 akaboom1_2w  = {TEXT, 0,                       kSTDyn5_2w}; +act12 amat5_2w     = {TEXT, 0,                       kSTMatch4_2w}; +act12 amissed2_2w  = {TEXT, 0,                       kSTFire1_2w}; +act12 amissed3_2w  = {TEXT, 0,                       kSTFire2_2w}; +act12 amurd4_2w    = {TEXT, 10,                      kSTArgue1_2w}; +act12 anobang_2w   = {TEXT, 0,                       kSTDyn7_2w}; +act12 anobang2_2w  = {TEXT, 0,                       kSTDyn6_2w}; +act12 anobell_2w   = {TEXT, 8,                       kSTBell2_2w}; +act12 anogenie_2w  = {TEXT, 0,                       kSTRub1_2w}; +act12 anoreply_2w  = {TEXT, 0,                       kSTBrrr_2w}; +act12 anotrap_2w   = {TEXT, 0,                       kSTTrap1_2w}; +act12 aom1_2w      = {TEXT, 8,                       kSTSom1_2w}; +act12 aom10_2w     = {TEXT, 50,                      kSTSom4_2w}; +act12 aom11_2w     = {TEXT, 50,                      kSTSom5_2w}; +act12 aom12_2w     = {TEXT, 50,                      kSTSom6_2w}; +act12 aom13_2w     = {TEXT, 54,                      kSTSom7_2w}; +act12 aom14_2w     = {TEXT, 54,                      kSTSom8_2w}; +act12 aom5_2w      = {TEXT, 16,                      kSTSom2_2w}; +act12 aom6_2w      = {TEXT, 20,                      kSTSom3_2w}; +act12 aom9_2w      = {TEXT, 40,                      kSTSom3a_2w}; +act12 apen1_2w     = {TEXT, 0,                       kSTSpen1_2w}; +act12 apen2_2w     = {TEXT, 0,                       kSTSpen2_2w}; +act12 apen3_2w     = {TEXT, 0,                       kSTSpen3_2w}; +act12 aphoto4_2w   = {TEXT, 0,                       kSTSphoto_2w}; +act12 aphoto6_2w   = {TEXT, 0,                       kSTSphoto1_2w}; +act12 apois1_2w    = {TEXT, 0,                       kSTSnake1_2w}; +act12 apois2_2w    = {TEXT, 0,                       kSTSnake2_2w}; +act12 apois3_2w    = {TEXT, 0,                       kSTSnake3_2w}; +act12 apois4_2w    = {TEXT, 0,                       kSTSnake4_2w}; +act12 aridkey2_2w  = {TEXT, 0,                       kSTSridkey_2w}; +act12 arobot1_2w   = {TEXT, 0,                       kSTFire3_2w}; +act12 arok_2w      = {TEXT, 0,                       kSTWell1_2w}; +act12 arumbling_2w = {TEXT, 0,                       kSTRumble_2w}; +act12 arup_2w      = {TEXT, 0,                       kSTDyn8_2w}; +act12 asafe1_2w    = {TEXT, 0,                       kSTSsafe1_2w}; +act12 ascr31_2w    = {TEXT, 0,                       kSTLock1_2w}; +act12 aserum1_2w   = {TEXT, 0,                       kSTSserum1_2w}; +act12 aserum2_2w   = {TEXT, 0,                       kSTSserum2_2w}; +act12 asilly_2w    = {TEXT, 0,                       kSTDyn9_2w}; +act12 asniff_2w    = {TEXT, 0,                       kSTCat1_2w}; +act12 asoggy_2w    = {TEXT, 0,                       kSTMatch1_2w}; +act12 asonic1_2w   = {TEXT, 0,                       kSTSsonic1_2w}; +act12 asonic2_2w   = {TEXT, 0,                       kSTSsonic2_2w}; +act12 asonic3_2w   = {TEXT, 0,                       kSTSsonic3_2w}; +act12 asonic4_2w   = {TEXT, 0,                       kSTSsonic4_2w}; +act12 astick1_2w   = {TEXT, 0,                       kSTWeee_2w}; +act12 astrike_2w   = {TEXT, 0,                       kSTMatch2_2w}; +act12 astung_2w    = {TEXT, 0,                       kSTStung_2w}; +act12 awarn_2w     = {TEXT, 8,                       kSTSwarn_2w}; +act12 awarnz_2w    = {TEXT, 8,                       kSTSwarnz_2w}; +act12 awho1_2w     = {TEXT, 0,                       kSTTard1_2w}; +act12 awho2_2w     = {TEXT, 0,                       kSTTard2_2w}; +act12 awill1_2w    = {TEXT, 0,                       kSTSwill1_2w}; +act12 awill2_2w    = {TEXT, 0,                       kSTSwill2_2w}; +act12 awill3_2w    = {TEXT, 0,                       kSTSwill3_2w}; +act12 awill4_2w    = {TEXT, 0,                       kSTSwill4_2w}; +act12 abell2_2w    = {TEXT, 16,                      kSTMaid6_2w}; +act12 abug5a_2w    = {TEXT, 0,                       kSTStingeroo_2w}; +act12 abug5b_2w    = {TEXT, 0,                       kSTSbug5b_2w}; +act12 aclick_2w    = {TEXT, 0,                       kSTClick_2w}; +act12 aempty_2w    = {TEXT, 0,                       kSTEmpty_2w}; +act12 afaint1_2w   = {TEXT, 5,                       kSTSfaint1_2w}; +act12 afaint10_2w  = {TEXT, 35,                      kSTSfaint4_2w}; +act12 afaint5_2w   = {TEXT, 20,                      kSTSfaint2_2w}; +act12 afaint9_2w   = {TEXT, 35,                      kSTSfaint3_2w}; +act12 agone10_2w   = {TEXT, 115,                     kSTSgone6_2w}; +act12 agone11_2w   = {TEXT, 115,                     kSTSgone7_2w}; +act12 agone5_2w    = {TEXT, 0,                       kSTSgone1_2w}; +act12 agone6_2w    = {TEXT, 34,                      kSTSgone2_2w}; +act12 agone7_2w    = {TEXT, 70,                      kSTSgone3_2w}; +act12 agone8_2w    = {TEXT, 90,                      kSTSgone4_2w}; +act12 agone9_2w    = {TEXT, 115,                     kSTSgone5_2w}; +act12 aharry3_2w   = {TEXT, 4,                       kSTOrgan1_2w}; +act12 aharry4_2w   = {TEXT, 4,                       kSTOrgan2_2w}; +act12 aharry5_2w   = {TEXT, 4,                       kSTOrgan3_2w}; +act12 aharry7_2w   = {TEXT, 8,                       kSTOrgan4_2w}; +act12 ahole_2w     = {TEXT, 0,                       kSTFirst2_2w}; +act12 akeyhole1_2w = {TEXT, 0,                       kSTHole1_2w}; +act12 alie1_2w     = {TEXT, 13,                      kSTTired_2w}; +act12 alie2_2w     = {TEXT, 18,                      kSTTired2_2w}; +act12 amaid10_2w   = {TEXT, 90 * NORMAL_TPS_v2d,     kSTSmaid1_8_2w}; +act12 amaid11_2w   = {TEXT, 99 * NORMAL_TPS_v2d,     kSTSmaid1_9_2w}; +act12 amaid12_2w   = {TEXT, 0,                       kSTSmaid1_10_2w}; +act12 amaid3_2w    = {TEXT, 4,                       kSTSmaid1_1_2w}; +act12 amaid4_2w    = {TEXT, 17,                      kSTSmaid1_2_2w}; +act12 amaid5_2w    = {TEXT, 17,                      kSTSmaid1_3_2w}; +act12 amaid6_2w    = {TEXT, 17,                      kSTSmaid1_4_2w}; +act12 amaid7_2w    = {TEXT, 30,                      kSTSmaid1_5_2w}; +act12 amaid8_2w    = {TEXT, 30 * NORMAL_TPS_v2d,     kSTSmaid1_6_2w}; +act12 amaid9_2w    = {TEXT, 60 * NORMAL_TPS_v2d,     kSTSmaid1_7_2w}; +act12 amaidp3_2w   = {TEXT, 8,                       kSTMaid1_2w}; +act12 amaidp4_2w   = {TEXT, 8,                       kSTMaid2_2w}; +act12 amaidp5_2w   = {TEXT, 8,                       kSTMaid3_2w}; +act12 amaidp7_2w   = {TEXT, 12,                      kSTMaid4_2w}; +act12 amaidp8_2w   = {TEXT, 12,                      kSTMaid5_2w}; +act12 anocarry_2w  = {TEXT, 0,                       kSTNocarry_2w}; +act12 anopurps_2w  = {TEXT, 0,                       kSTNopurps_2w}; +act12 aok_2w       = {TEXT, 0,                       kSTOkgen_2w}; +act12 ascr21_2w    = {TEXT, 0,                       kSTSfirst_2w}; +act12 astory_2w    = {TEXT, STORYDELAY,              kSTStory_2w};  act13 ascr33b_2w   = {SWAP_IMAGES, 4,   HERO, PENNY_2w};  act13 aswaphero_2w = {SWAP_IMAGES, 120, HERO, PENNY_2w}; @@ -7250,7 +7252,7 @@ act19 achkgates_2w  = {TEST_STATE_BITS, 2, BUTTON_2w, 16, kALswgates_2w,   kALru  act19 achkglight_2w = {TEST_STATE_BITS, 2, BUTTON_2w, 2,  kALglightoff_2w, kALglighton_2w};  act19 achkgo_2w     = {TEST_STATE_BITS, 0, BUTTON_2w, 32, kALgoopen_2w,    kALgoclosed_2w};  act19 achkslight_2w = {TEST_STATE_BITS, 2, BUTTON_2w, 1,  kALslightoff_2w, kALslighton_2w}; -act19 achksong_2w   = {TEST_STATE_BITS, 0, COP_2w,    8,  0,            kALsong4_2w}; +act19 achksong_2w   = {TEST_STATE_BITS, 0, COP_2w,    8,  0,               kALsong4_2w};  act19 achkzapper_2w = {TEST_STATE_BITS, 2, BUTTON_2w, 4,  kALswzapper_2w,  kALclick_2w};  act19 aswgates_2w   = {TEST_STATE_BITS, 2, BUTTON_2w, 32, kALgatescls_2w,  kALgatesopn_2w};  act19 aswzapper_2w  = {TEST_STATE_BITS, 2, BUTTON_2w, 8,  kALzapperoff_2w, kALzapperon_2w}; @@ -7365,14 +7367,14 @@ act33 amaidc11_2w = {INIT_SCREEN, 30, MAID_2w,      31};  act33 amaidc2_2w  = {INIT_SCREEN, 8,  MAID_2w,      32};  act33 amaidp1_2w  = {INIT_SCREEN, 0,  MAID_2w,      31}; -act34 abang1_2w   = {AGSCHEDULE, 6 * NORMAL_TPS,   kALbang2_2w}; -act34 abite3_2w   = {AGSCHEDULE, 60 * NORMAL_TPS,  kALpois1_2w}; -act34 abite4_2w   = {AGSCHEDULE, 200 * NORMAL_TPS, kALpois2_2w}; -act34 abite5_2w   = {AGSCHEDULE, 290 * NORMAL_TPS, kALpois3_2w}; -act34 abite6_2w   = {AGSCHEDULE, 300 * NORMAL_TPS, kALpois4_2w}; -act34 acat3_2w    = {AGSCHEDULE, 8 * NORMAL_TPS,   kALchkcarry_2w}; -act34 akaboom2_2w = {AGSCHEDULE, 1,                kALkaboom3_2w}; -act34 amaidb6_2w  = {AGSCHEDULE, 8 * NORMAL_TPS,   kALmaidbk_2w}; +act34 abang1_2w   = {AGSCHEDULE, 6 * NORMAL_TPS_v2d,   kALbang2_2w}; +act34 abite3_2w   = {AGSCHEDULE, 60 * NORMAL_TPS_v2d,  kALpois1_2w}; +act34 abite4_2w   = {AGSCHEDULE, 200 * NORMAL_TPS_v2d, kALpois2_2w}; +act34 abite5_2w   = {AGSCHEDULE, 290 * NORMAL_TPS_v2d, kALpois3_2w}; +act34 abite6_2w   = {AGSCHEDULE, 300 * NORMAL_TPS_v2d, kALpois4_2w}; +act34 acat3_2w    = {AGSCHEDULE, 8 * NORMAL_TPS_v2d,   kALchkcarry_2w}; +act34 akaboom2_2w = {AGSCHEDULE, 1,                    kALkaboom3_2w}; +act34 amaidb6_2w  = {AGSCHEDULE, 8 * NORMAL_TPS_v2d,   kALmaidbk_2w};  act35 amap0_2w = {REMAPPAL, 0, _TLIGHTMAGENTA, _TLIGHTMAGENTA};  act35 amap1_2w = {REMAPPAL, 0, _TLIGHTMAGENTA, _TBLACK}; @@ -8006,50 +8008,50 @@ act8 ascr_wfall_clf_3w      = {NEW_SCREEN, 0,   CLIFF_3w};  act8 ascr_wfallb_wbase_3w   = {NEW_SCREEN, 0,   WBASE_3w};  act8 aweb23_3w              = {NEW_SCREEN, 117, CRASH_3w}; -act9 abrg_msg2_3w    = {INIT_OBJSTATE, 0,              VINE_3w,     1}; -act9 acageempty_3w   = {INIT_OBJSTATE, 0,              CAGE_3w,     0}; -act9 acamp0a_3w      = {INIT_OBJSTATE, 4,              NAT2_3w,     0}; -act9 acom0b_3w       = {INIT_OBJSTATE, 0,              NAT1_3w,     1}; -act9 acom1b_3w       = {INIT_OBJSTATE, 0,              NAT1_3w,     2}; -act9 acom2b_3w       = {INIT_OBJSTATE, 0,              NAT1_3w,     3}; -act9 acom3b_3w       = {INIT_OBJSTATE, 0,              NAT1_3w,     4}; -act9 acom4b_3w       = {INIT_OBJSTATE, 0,              NAT1_3w,     5}; -act9 acom5b_3w       = {INIT_OBJSTATE, 0,              NAT1_3w,     6}; -act9 acom6b_3w       = {INIT_OBJSTATE, 0,              NAT1_3w,     7}; -act9 acom7b_3w       = {INIT_OBJSTATE, 0,              NAT1_3w,     8}; -act9 acom8b_3w       = {INIT_OBJSTATE, 0,              NAT1_3w,     9}; -act9 adart1_3w       = {INIT_OBJSTATE, 0,              BLOWPIPE_3w, 1}; -act9 adn_3w          = {INIT_OBJSTATE, 0,              HERO,        0}; -act9 adrink_3w       = {INIT_OBJSTATE, 0,              FLASK_3w,    0}; -act9 adropcheese3_3w = {INIT_OBJSTATE, 0,              CHEESE_3w,   1}; -act9 aelewoken_3w    = {INIT_OBJSTATE, 0,              ELEPHANT_3w, 0}; -act9 aemptyflask_3w  = {INIT_OBJSTATE, 0,              FLASK_3w,    0}; -act9 aendaction_3w   = {INIT_OBJSTATE, DARTTIME + 30,  E_EYES_3w,   0}; -act9 aenter1_3w      = {INIT_OBJSTATE, 0,              MOUSE_3w,    2}; -act9 aenter9_3w      = {INIT_OBJSTATE, 0,              CAGE_3w,     1}; -act9 aex7_3w         = {INIT_OBJSTATE, 0,              GHOST_3w,    1}; -act9 aex9_3w         = {INIT_OBJSTATE, 0,              VINE3_3w,    1}; -act9 afillmagic3_3w  = {INIT_OBJSTATE, 0,              FLASK_3w,    2}; -act9 afillord2_3w    = {INIT_OBJSTATE, 0,              FLASK_3w,    1}; -act9 afindb1_3w      = {INIT_OBJSTATE, 0,              BOOK_3w,     1}; -act9 agive3_3w       = {INIT_OBJSTATE, 0,              NAT1_3w,     10}; -act9 agot1_3w        = {INIT_OBJSTATE, 0,              DOCTOR_3w,   1}; -act9 ahelp2_3w       = {INIT_OBJSTATE, 0,              HERO,        1}; -act9 ahole5a_3w      = {INIT_OBJSTATE, 0,              MOUSE_3w,    1}; -act9 ahole5b_3w      = {INIT_OBJSTATE, 0,              MOUSE_3w,    0}; -act9 amakeclay2_3w   = {INIT_OBJSTATE, 0,              CLAY_3w,     1}; -act9 amission1_3w    = {INIT_OBJSTATE, 0,              PENNY_3w,    2}; -act9 amousefree_3w   = {INIT_OBJSTATE, 0,              MOUSE_3w,    3}; -act9 aoldstate_3w    = {INIT_OBJSTATE, 0,              MOUTH_3w,    1}; -act9 aopen2_3w       = {INIT_OBJSTATE, 0,              CDOOR_3w,    1}; -act9 apause0_3w      = {INIT_OBJSTATE, 3 * NORMAL_TPS, NAT2_3w,     0}; -act9 apause1_3w      = {INIT_OBJSTATE, 0,              NAT2_3w,     1}; -act9 astartaction_3w = {INIT_OBJSTATE, 0,              E_EYES_3w,   1}; -act9 astick3_3w      = {INIT_OBJSTATE, 0,              DOCTOR_3w,   2}; -act9 atakecheese1_3w = {INIT_OBJSTATE, 0,              CHEESE_3w,   0}; -act9 aup_3w          = {INIT_OBJSTATE, 0,              HERO,        1}; -act9 avine7_3w       = {INIT_OBJSTATE, 0,              BLOCK1_3w,   1}; -act9 aweb1_3w        = {INIT_OBJSTATE, 0,              PENNY_3w,    1}; +act9 abrg_msg2_3w    = {INIT_OBJSTATE, 0,                  VINE_3w,     1}; +act9 acageempty_3w   = {INIT_OBJSTATE, 0,                  CAGE_3w,     0}; +act9 acamp0a_3w      = {INIT_OBJSTATE, 4,                  NAT2_3w,     0}; +act9 acom0b_3w       = {INIT_OBJSTATE, 0,                  NAT1_3w,     1}; +act9 acom1b_3w       = {INIT_OBJSTATE, 0,                  NAT1_3w,     2}; +act9 acom2b_3w       = {INIT_OBJSTATE, 0,                  NAT1_3w,     3}; +act9 acom3b_3w       = {INIT_OBJSTATE, 0,                  NAT1_3w,     4}; +act9 acom4b_3w       = {INIT_OBJSTATE, 0,                  NAT1_3w,     5}; +act9 acom5b_3w       = {INIT_OBJSTATE, 0,                  NAT1_3w,     6}; +act9 acom6b_3w       = {INIT_OBJSTATE, 0,                  NAT1_3w,     7}; +act9 acom7b_3w       = {INIT_OBJSTATE, 0,                  NAT1_3w,     8}; +act9 acom8b_3w       = {INIT_OBJSTATE, 0,                  NAT1_3w,     9}; +act9 adart1_3w       = {INIT_OBJSTATE, 0,                  BLOWPIPE_3w, 1}; +act9 adn_3w          = {INIT_OBJSTATE, 0,                  HERO,        0}; +act9 adrink_3w       = {INIT_OBJSTATE, 0,                  FLASK_3w,    0}; +act9 adropcheese3_3w = {INIT_OBJSTATE, 0,                  CHEESE_3w,   1}; +act9 aelewoken_3w    = {INIT_OBJSTATE, 0,                  ELEPHANT_3w, 0}; +act9 aemptyflask_3w  = {INIT_OBJSTATE, 0,                  FLASK_3w,    0}; +act9 aendaction_3w   = {INIT_OBJSTATE, DARTTIME + 30,      E_EYES_3w,   0}; +act9 aenter1_3w      = {INIT_OBJSTATE, 0,                  MOUSE_3w,    2}; +act9 aenter9_3w      = {INIT_OBJSTATE, 0,                  CAGE_3w,     1}; +act9 aex7_3w         = {INIT_OBJSTATE, 0,                  GHOST_3w,    1}; +act9 aex9_3w         = {INIT_OBJSTATE, 0,                  VINE3_3w,    1}; +act9 afillmagic3_3w  = {INIT_OBJSTATE, 0,                  FLASK_3w,    2}; +act9 afillord2_3w    = {INIT_OBJSTATE, 0,                  FLASK_3w,    1}; +act9 afindb1_3w      = {INIT_OBJSTATE, 0,                  BOOK_3w,     1}; +act9 agive3_3w       = {INIT_OBJSTATE, 0,                  NAT1_3w,     10}; +act9 agot1_3w        = {INIT_OBJSTATE, 0,                  DOCTOR_3w,   1}; +act9 ahelp2_3w       = {INIT_OBJSTATE, 0,                  HERO,        1}; +act9 ahole5a_3w      = {INIT_OBJSTATE, 0,                  MOUSE_3w,    1}; +act9 ahole5b_3w      = {INIT_OBJSTATE, 0,                  MOUSE_3w,    0}; +act9 amakeclay2_3w   = {INIT_OBJSTATE, 0,                  CLAY_3w,     1}; +act9 amission1_3w    = {INIT_OBJSTATE, 0,                  PENNY_3w,    2}; +act9 amousefree_3w   = {INIT_OBJSTATE, 0,                  MOUSE_3w,    3}; +act9 aoldstate_3w    = {INIT_OBJSTATE, 0,                  MOUTH_3w,    1}; +act9 aopen2_3w       = {INIT_OBJSTATE, 0,                  CDOOR_3w,    1}; +act9 apause0_3w      = {INIT_OBJSTATE, 3 * NORMAL_TPS_v2d, NAT2_3w,     0}; +act9 apause1_3w      = {INIT_OBJSTATE, 0,                  NAT2_3w,     1}; +act9 astartaction_3w = {INIT_OBJSTATE, 0,                  E_EYES_3w,   1}; +act9 astick3_3w      = {INIT_OBJSTATE, 0,                  DOCTOR_3w,   2}; +act9 atakecheese1_3w = {INIT_OBJSTATE, 0,                  CHEESE_3w,   0}; +act9 aup_3w          = {INIT_OBJSTATE, 0,                  HERO,        1}; +act9 avine7_3w       = {INIT_OBJSTATE, 0,                  BLOCK1_3w,   1}; +act9 aweb1_3w        = {INIT_OBJSTATE, 0,                  PENNY_3w,    1};  act10 acamp1a_3w  = {INIT_PATH, 0,  NAT2_3w,   AUTO,    0,      0};  act10 acamp1b_3w  = {INIT_PATH, 0,  NATG_3w,   AUTO,    0,      0}; @@ -8072,62 +8074,62 @@ act10 adisable_3w = {INIT_PATH, 0,  HERO,      AUTO,    0,      0};  act10 aenable_3w  = {INIT_PATH, 0,  HERO,      USER,    0,      0};  act10 aquiet_3w   = {INIT_PATH, 0,  HERO,      QUIET,   0,      0}; -act11 aactiontest1_3w = {COND_R, 0,               E_EYES_3w,   1,  0,                 kALoktoleave1_3w}; -act11 aactiontest2_3w = {COND_R, 0,               E_EYES_3w,   1,  0,                 kALoktoleave2_3w}; -act11 ablktest_3w     = {COND_R, 0,               BLOCK1_3w,   0,  kALblk1_3w,           0}; -act11 abrgmsgtest_3w  = {COND_R, 0,               VINE_3w,     0,  kALbrg_clftop_msg_3w, kALbrg_clftop1_3w}; -act11 abrgtest_3w     = {COND_R, 0,               VINE_3w,     0,  kALbrg_ok_3w,         kALbrg_down_3w}; -act11 abridgetest_3w  = {COND_R, 0,               BLOCK1_3w,   0,  kALbridge_3w,         0}; -act11 acagetest_3w    = {COND_R, 0,               MOUSE_3w,    2,  0,                 kALpostest_3w}; -act11 acagetest1_3w   = {COND_R, 0,               MOUSE_3w,    2,  kALcagetest2_3w,      kALok_3w}; -act11 acagetest5_3w   = {COND_R, 0,               MOUSE_3w,    2,  kALcageprompt_3w,     kALmousegone_3w}; -act11 acamptest_3w    = {COND_R, 0,               NAT1_3w,     0,  kALcampers_3w,        kALchase_3w}; -act11 acavetest_3w    = {COND_R, 0,               GHOST_3w,    0,  kALspirit_3w,         kALcave_man_3w}; -act11 acrashtest1_3w  = {COND_R, 0,               PENNY_3w,    0,  kALcrashed_3w,        kALcrashtest2_3w}; -act11 acrashtest2_3w  = {COND_R, 0,               PENNY_3w,    1,  kALcryhelp_3w,        0}; -act11 adartedtest_3w  = {COND_R, 0,               BLOWPIPE_3w, 0,  kALdodart_3w,         kALdarted_3w}; -act11 adoctest_3w     = {COND_R, 0,               DOCTOR_3w,   0,  kALdoc_3w,            0}; -act11 adrinktest_3w   = {COND_R, 0,               FLASK_3w,    0,  kALdrinkno_3w,        kALdrinkyes_3w}; -act11 aeletest1_3w    = {COND_R, 0,               ELEPHANT_3w, 1,  kALele_sleep_3w,      kALeletest2_3w}; -act11 aeletest2_3w    = {COND_R, 0,               ELEPHANT_3w, 0,  kALeleblink_3w,       0}; -act11 aemptytest1_3w  = {COND_R, 0,               FLASK_3w,    2,  kALemptymagic_3w,     kALemptytest2_3w}; -act11 aemptytest2_3w  = {COND_R, 0,               FLASK_3w,    1,  kALemptyord_3w,       kALdrinkno_3w}; -act11 aentertest1_3w  = {COND_R, 0,               CHEESE_3w,   1,  kALentertest2_3w,     0}; -act11 aentertest2_3w  = {COND_R, 0,               MOUSE_3w,    0,  kALentertest3_3w,     0}; -act11 aexotest1_3w    = {COND_R, 0,               GHOST_3w,    0,  kALexotest2_3w,       kALexordone_3w}; -act11 afindbtest_3w   = {COND_R, 0,               BOOK_3w,     0,  kALfindit_3w,         0}; -act11 aflasktest2_3w  = {COND_R, 0,               FLASK_3w,    2,  kALremedy_3w,         kALflasktest3_3w}; -act11 aflasktest3_3w  = {COND_R, 0,               FLASK_3w,    1,  kALnoremedy_3w,       kALrefuseflask_3w}; -act11 agettest2_3w    = {COND_R, 0,               DOCTOR_3w,   0,  kALgot_3w,            0}; -act11 agivetest_3w    = {COND_R, 0,               NAT1_3w,     10, kALrefuse_3w,         kALgive_3w}; -act11 ahoriz1_3w      = {COND_R, 0,               HERO,        0,  kALup_3w,             0}; -act11 ahoriz2_3w      = {COND_R, 0,               HERO,        1,  kALdn_3w,             0}; -act11 anat0_3w        = {COND_R, 0,               NAT1_3w,     0,  kALcom0_3w,           kALnat1_3w}; -act11 anat1_3w        = {COND_R, 0,               NAT1_3w,     1,  kALcom1_3w,           kALnat2_3w}; -act11 anat2_3w        = {COND_R, 0,               NAT1_3w,     2,  kALcom2_3w,           kALnat3_3w}; -act11 anat3_3w        = {COND_R, 0,               NAT1_3w,     3,  kALcom3_3w,           kALnat4_3w}; -act11 anat4_3w        = {COND_R, 0,               NAT1_3w,     4,  kALcom4_3w,           kALnat5_3w}; -act11 anat5_3w        = {COND_R, 0,               NAT1_3w,     5,  kALcom5_3w,           kALnat6_3w}; -act11 anat6_3w        = {COND_R, 0,               NAT1_3w,     6,  kALcom6_3w,           kALnat7_3w}; -act11 anat7_3w        = {COND_R, 0,               NAT1_3w,     7,  kALcom7_3w,           kALnat8_3w}; -act11 anat8_3w        = {COND_R, 0,               NAT1_3w,     8,  kALcom8_3w,           0}; -act11 aold5_3w        = {COND_R, 0,               FLASK_3w,    2,  kALold6_3w,           kALwrong_3w}; -act11 aoldmantest_3w  = {COND_R, 0,               MOUTH_3w,    0,  kALoldfirst_3w,       kALoldsubseq_3w}; -act11 aopentest_3w    = {COND_R, 0,               DOCTOR_3w,   1,  kALprod_3w,           kALopencdoor_3w}; -act11 apausetest_3w   = {COND_R, 0,               NAT2_3w,     1,  0,                 kALcomment_3w}; -act11 apostest_3w     = {COND_R, 0,               MOUSE_3w,    0,  kALmousel_3w,         kALmouser_3w}; -act11 aspirittest_3w  = {COND_R, 0,               GHOST_3w,    0,  kALwarn_3w,           0}; -act11 asticktest1_3w  = {COND_R, 0,               DOCTOR_3w,   2,  kALstuckpin_3w,       kALsticktest2_3w}; -act11 asticktest2_3w  = {COND_R, 0,               CLAY_3w,     1,  kALstickpin_3w,       kALnostickpin_3w}; -act11 ataketest1_3w   = {COND_R, 0,               MOUSE_3w,    2,  kALtakeit_3w,         kALcanttake_3w}; -act11 ataketest2_3w   = {COND_R, 0,               MOUSE_3w,    3,  kALtakeit_3w,         kALtaketest1_3w}; -act11 atalktest1_3w   = {COND_R, 0,               NAT1_3w,     9,  kALnat9_3w,           kALnative_3w}; -act11 atdtest_3w      = {COND_R, 0,               DOCTOR_3w,   2,  kALtalkdoc2_3w,       kALtalkdoc1_3w}; -act11 atiptest_3w     = {COND_R, 60 * NORMAL_TPS, BLOCK1_3w,   0,  kALbtipprompt_3w,     0}; -act11 auntietest_3w   = {COND_R, 0,               BLOCK1_3w,   0,  kALnottied_3w,        kALuntie_3w}; -act11 avinetest_3w    = {COND_R, 0,               BLOCK1_3w,   0,  kALtievine_3w,        kALtied_3w}; -act11 awebtest1_3w    = {COND_R, 0,               PENNY_3w,    0,  kALspider_3w,         kALwebtest2_3w}; -act11 awebtest2_3w    = {COND_R, 0,               PENNY_3w,    1,  kALmission_3w,        kALreturn_3w}; +act11 aactiontest1_3w = {COND_R, 0,                   E_EYES_3w,   1,  0,                    kALoktoleave1_3w}; +act11 aactiontest2_3w = {COND_R, 0,                   E_EYES_3w,   1,  0,                    kALoktoleave2_3w}; +act11 ablktest_3w     = {COND_R, 0,                   BLOCK1_3w,   0,  kALblk1_3w,           0}; +act11 abrgmsgtest_3w  = {COND_R, 0,                   VINE_3w,     0,  kALbrg_clftop_msg_3w, kALbrg_clftop1_3w}; +act11 abrgtest_3w     = {COND_R, 0,                   VINE_3w,     0,  kALbrg_ok_3w,         kALbrg_down_3w}; +act11 abridgetest_3w  = {COND_R, 0,                   BLOCK1_3w,   0,  kALbridge_3w,         0}; +act11 acagetest_3w    = {COND_R, 0,                   MOUSE_3w,    2,  0,                    kALpostest_3w}; +act11 acagetest1_3w   = {COND_R, 0,                   MOUSE_3w,    2,  kALcagetest2_3w,      kALok_3w}; +act11 acagetest5_3w   = {COND_R, 0,                   MOUSE_3w,    2,  kALcageprompt_3w,     kALmousegone_3w}; +act11 acamptest_3w    = {COND_R, 0,                   NAT1_3w,     0,  kALcampers_3w,        kALchase_3w}; +act11 acavetest_3w    = {COND_R, 0,                   GHOST_3w,    0,  kALspirit_3w,         kALcave_man_3w}; +act11 acrashtest1_3w  = {COND_R, 0,                   PENNY_3w,    0,  kALcrashed_3w,        kALcrashtest2_3w}; +act11 acrashtest2_3w  = {COND_R, 0,                   PENNY_3w,    1,  kALcryhelp_3w,        0}; +act11 adartedtest_3w  = {COND_R, 0,                   BLOWPIPE_3w, 0,  kALdodart_3w,         kALdarted_3w}; +act11 adoctest_3w     = {COND_R, 0,                   DOCTOR_3w,   0,  kALdoc_3w,            0}; +act11 adrinktest_3w   = {COND_R, 0,                   FLASK_3w,    0,  kALdrinkno_3w,        kALdrinkyes_3w}; +act11 aeletest1_3w    = {COND_R, 0,                   ELEPHANT_3w, 1,  kALele_sleep_3w,      kALeletest2_3w}; +act11 aeletest2_3w    = {COND_R, 0,                   ELEPHANT_3w, 0,  kALeleblink_3w,       0}; +act11 aemptytest1_3w  = {COND_R, 0,                   FLASK_3w,    2,  kALemptymagic_3w,     kALemptytest2_3w}; +act11 aemptytest2_3w  = {COND_R, 0,                   FLASK_3w,    1,  kALemptyord_3w,       kALdrinkno_3w}; +act11 aentertest1_3w  = {COND_R, 0,                   CHEESE_3w,   1,  kALentertest2_3w,     0}; +act11 aentertest2_3w  = {COND_R, 0,                   MOUSE_3w,    0,  kALentertest3_3w,     0}; +act11 aexotest1_3w    = {COND_R, 0,                   GHOST_3w,    0,  kALexotest2_3w,       kALexordone_3w}; +act11 afindbtest_3w   = {COND_R, 0,                   BOOK_3w,     0,  kALfindit_3w,         0}; +act11 aflasktest2_3w  = {COND_R, 0,                   FLASK_3w,    2,  kALremedy_3w,         kALflasktest3_3w}; +act11 aflasktest3_3w  = {COND_R, 0,                   FLASK_3w,    1,  kALnoremedy_3w,       kALrefuseflask_3w}; +act11 agettest2_3w    = {COND_R, 0,                   DOCTOR_3w,   0,  kALgot_3w,            0}; +act11 agivetest_3w    = {COND_R, 0,                   NAT1_3w,     10, kALrefuse_3w,         kALgive_3w}; +act11 ahoriz1_3w      = {COND_R, 0,                   HERO,        0,  kALup_3w,             0}; +act11 ahoriz2_3w      = {COND_R, 0,                   HERO,        1,  kALdn_3w,             0}; +act11 anat0_3w        = {COND_R, 0,                   NAT1_3w,     0,  kALcom0_3w,           kALnat1_3w}; +act11 anat1_3w        = {COND_R, 0,                   NAT1_3w,     1,  kALcom1_3w,           kALnat2_3w}; +act11 anat2_3w        = {COND_R, 0,                   NAT1_3w,     2,  kALcom2_3w,           kALnat3_3w}; +act11 anat3_3w        = {COND_R, 0,                   NAT1_3w,     3,  kALcom3_3w,           kALnat4_3w}; +act11 anat4_3w        = {COND_R, 0,                   NAT1_3w,     4,  kALcom4_3w,           kALnat5_3w}; +act11 anat5_3w        = {COND_R, 0,                   NAT1_3w,     5,  kALcom5_3w,           kALnat6_3w}; +act11 anat6_3w        = {COND_R, 0,                   NAT1_3w,     6,  kALcom6_3w,           kALnat7_3w}; +act11 anat7_3w        = {COND_R, 0,                   NAT1_3w,     7,  kALcom7_3w,           kALnat8_3w}; +act11 anat8_3w        = {COND_R, 0,                   NAT1_3w,     8,  kALcom8_3w,           0}; +act11 aold5_3w        = {COND_R, 0,                   FLASK_3w,    2,  kALold6_3w,           kALwrong_3w}; +act11 aoldmantest_3w  = {COND_R, 0,                   MOUTH_3w,    0,  kALoldfirst_3w,       kALoldsubseq_3w}; +act11 aopentest_3w    = {COND_R, 0,                   DOCTOR_3w,   1,  kALprod_3w,           kALopencdoor_3w}; +act11 apausetest_3w   = {COND_R, 0,                   NAT2_3w,     1,  0,                    kALcomment_3w}; +act11 apostest_3w     = {COND_R, 0,                   MOUSE_3w,    0,  kALmousel_3w,         kALmouser_3w}; +act11 aspirittest_3w  = {COND_R, 0,                   GHOST_3w,    0,  kALwarn_3w,           0}; +act11 asticktest1_3w  = {COND_R, 0,                   DOCTOR_3w,   2,  kALstuckpin_3w,       kALsticktest2_3w}; +act11 asticktest2_3w  = {COND_R, 0,                   CLAY_3w,     1,  kALstickpin_3w,       kALnostickpin_3w}; +act11 ataketest1_3w   = {COND_R, 0,                   MOUSE_3w,    2,  kALtakeit_3w,         kALcanttake_3w}; +act11 ataketest2_3w   = {COND_R, 0,                   MOUSE_3w,    3,  kALtakeit_3w,         kALtaketest1_3w}; +act11 atalktest1_3w   = {COND_R, 0,                   NAT1_3w,     9,  kALnat9_3w,           kALnative_3w}; +act11 atdtest_3w      = {COND_R, 0,                   DOCTOR_3w,   2,  kALtalkdoc2_3w,       kALtalkdoc1_3w}; +act11 atiptest_3w     = {COND_R, 60 * NORMAL_TPS_v2d, BLOCK1_3w,   0,  kALbtipprompt_3w,     0}; +act11 auntietest_3w   = {COND_R, 0,                   BLOCK1_3w,   0,  kALnottied_3w,        kALuntie_3w}; +act11 avinetest_3w    = {COND_R, 0,                   BLOCK1_3w,   0,  kALtievine_3w,        kALtied_3w}; +act11 awebtest1_3w    = {COND_R, 0,                   PENNY_3w,    0,  kALspider_3w,         kALwebtest2_3w}; +act11 awebtest2_3w    = {COND_R, 0,                   PENNY_3w,    1,  kALmission_3w,        kALreturn_3w};  act12 ablk1_3w         = {TEXT, 0,   kSTBlk1_3w};  act12 abook1_3w        = {TEXT, 0,   kSTBook1_3w}; @@ -8781,138 +8783,138 @@ int repbut2_1d[] = {kSTsbut2_1d, -1};  int repopen_1d[] = {kSTsopenr_1d, -1};  // Hugo 1 DOS -act0 aend_1d       = {ASCHEDULE, 4 * NORMAL_TPS,  kALend_1d}; -act0 ajailrep_1d   = {ASCHEDULE, 4,               kALjailrep_1d}; -act0 acycle_1d     = {ASCHEDULE, 0,               kALcycle_1d}; -act0 areparm_1d    = {ASCHEDULE, 5 * NORMAL_TPS,  kALreparm_1d}; -act0 arepbat_1d    = {ASCHEDULE, 12 * NORMAL_TPS, kALbat_1d}; -act0 arepbata_1d   = {ASCHEDULE, 3 * NORMAL_TPS,  kALbatrep_1d}; -act0 arepeye_1d    = {ASCHEDULE, 8 * NORMAL_TPS,  kALblinkeyes1_1d}; -act0 arepeye2_1d   = {ASCHEDULE, 8 * NORMAL_TPS,  kALblinkeyes2_1d}; -act0 areplight_1d  = {ASCHEDULE, 11 * NORMAL_TPS, kALightning_1d}; -act0 areplips_1d   = {ASCHEDULE, 4 * NORMAL_TPS,  kALreplips_1d}; -act0 arepredeye_1d = {ASCHEDULE, 6 * NORMAL_TPS,  kALrepredeye_1d}; -act0 aweird_1d     = {ASCHEDULE, 16,              kALweird_1d}; - -act1 aridchop_1d     = {START_OBJ, 0,                  CHOP_1d,     0, ALMOST_INVISIBLE}; -act1 ashowchop_1d    = {START_OBJ, 0,                  CHOP_1d,     0, NOT_CYCLING}; -act1 a115b_1d        = {START_OBJ, 0,                  MASK_1d,     0, NOT_CYCLING}; -act1 abin2_1d        = {START_OBJ, 0,                  HERO,        0, ALMOST_INVISIBLE}; -act1 about2_1d       = {START_OBJ, 0,                  HERO,        0, NOT_CYCLING}; -act1 abox10_1d       = {START_OBJ, 38,                 PROF_1d,     0, CYCLE_FORWARD}; -act1 abox11_1d       = {START_OBJ, 73,                 PROF_1d,     0, ALMOST_INVISIBLE}; -act1 abut6d_1d       = {START_OBJ, 7,                  HERO,        0, ALMOST_INVISIBLE}; -act1 abut6f_1d       = {START_OBJ, 7,                  HDLSHERO_1d, 0, NOT_CYCLING}; -act1 aclosetrap_1d   = {START_OBJ, 1 * NORMAL_TPS,     TRAP_1d,     1, CYCLE_BACKWARD}; -act1 adogcyc_1d      = {START_OBJ, 0,                  DOG_1d,      0, CYCLE_FORWARD}; -act1 adoggy1_1d      = {START_OBJ, 0,                  HERO,        0, ALMOST_INVISIBLE}; -act1 adoggy3_1d      = {START_OBJ, 0,                  HERODEAD_1d, 0, NOT_CYCLING}; -act1 aguardgo1_1d    = {START_OBJ, 0,                  GUARD_1d,    0, CYCLE_FORWARD}; -act1 ajail2_1d       = {START_OBJ, 0,                  HERO,        0, CYCLE_FORWARD}; -act1 alab5_1d        = {START_OBJ, 0,                  PROF_1d,     0, CYCLE_FORWARD}; -act1 alab8_1d        = {START_OBJ, 12,                 PROF_1d,     0, NOT_CYCLING}; -act1 alab9_1d        = {START_OBJ, 16,                 IGOR_1d,     0, NOT_CYCLING}; -act1 aopentrap_1d    = {START_OBJ, 1 * NORMAL_TPS,     TRAP_1d,     1, CYCLE_FORWARD}; -act1 aridbung_1d     = {START_OBJ, 0,                  BUNG_1d,     0, ALMOST_INVISIBLE}; -act1 atheend1_1d     = {START_OBJ, 5 * NORMAL_TPS,     HERO,        0, ALMOST_INVISIBLE}; -act1 aarm_1d         = {START_OBJ, 0,                  ARM_1d,      3, CYCLE_BACKWARD}; -act1 ablink1a_1d     = {START_OBJ, 0,                  EYES1_1d,    0, ALMOST_INVISIBLE}; -act1 ablink1b_1d     = {START_OBJ, 1,                  EYES1_1d,    0, NOT_CYCLING}; -act1 ablink1c_1d     = {START_OBJ, 2,                  EYES1_1d,    0, ALMOST_INVISIBLE}; -act1 ablink1d_1d     = {START_OBJ, 3,                  EYES1_1d,    0, NOT_CYCLING}; -act1 ablink2a_1d     = {START_OBJ, 3 * NORMAL_TPS + 0, EYES2_1d,    0, ALMOST_INVISIBLE}; -act1 ablink2b_1d     = {START_OBJ, 3 * NORMAL_TPS + 1, EYES2_1d,    0, NOT_CYCLING}; -act1 ablink2c_1d     = {START_OBJ, 3 * NORMAL_TPS + 2, EYES2_1d,    0, ALMOST_INVISIBLE}; -act1 ablink2d_1d     = {START_OBJ, 3 * NORMAL_TPS + 3, EYES2_1d,    0, NOT_CYCLING}; -act1 ablink3a_1d     = {START_OBJ, 0,                  EYES3_1d,    0, ALMOST_INVISIBLE}; -act1 ablink3b_1d     = {START_OBJ, 1,                  EYES3_1d,    0, NOT_CYCLING}; -act1 ablink3c_1d     = {START_OBJ, 2,                  EYES3_1d,    0, ALMOST_INVISIBLE}; -act1 ablink3d_1d     = {START_OBJ, 3,                  EYES3_1d,    0, NOT_CYCLING}; -act1 ablink4a_1d     = {START_OBJ, 3 * NORMAL_TPS + 0, EYES4_1d,    0, ALMOST_INVISIBLE}; -act1 ablink4b_1d     = {START_OBJ, 3 * NORMAL_TPS + 1, EYES4_1d,    0, NOT_CYCLING}; -act1 ablink4c_1d     = {START_OBJ, 3 * NORMAL_TPS + 2, EYES4_1d,    0, ALMOST_INVISIBLE}; -act1 ablink4d_1d     = {START_OBJ, 3 * NORMAL_TPS + 3, EYES4_1d,    0, NOT_CYCLING}; -act1 ablink5a_1d     = {START_OBJ, 0,                  REDEYES_1d,  0, ALMOST_INVISIBLE}; -act1 ablink5b_1d     = {START_OBJ, 1,                  REDEYES_1d,  0, NOT_CYCLING}; -act1 ablink5c_1d     = {START_OBJ, 2,                  REDEYES_1d,  0, ALMOST_INVISIBLE}; -act1 ablink5d_1d     = {START_OBJ, 3,                  REDEYES_1d,  0, NOT_CYCLING}; -act1 abut1_1d        = {START_OBJ, 4 * NORMAL_TPS,     BUTLER_1d,   0, CYCLE_FORWARD}; -act1 aclosedoor1_1d  = {START_OBJ, 1 * NORMAL_TPS,     DOOR1_1d,    1, CYCLE_BACKWARD}; -act1 aclosedoor4_1d  = {START_OBJ, 1 * NORMAL_TPS,     DOOR4_1d,    1, CYCLE_BACKWARD}; -act1 aclosewdoorl_1d = {START_OBJ, 1 * NORMAL_TPS,     WDOORL_1d,   1, CYCLE_BACKWARD}; -act1 aclosewdoorr_1d = {START_OBJ, 1 * NORMAL_TPS,     WDOORR_1d,   1, CYCLE_BACKWARD}; -act1 adog1_1d        = {START_OBJ, 0,                  DOG_1d,      0, CYCLE_FORWARD}; -act1 alips_1d        = {START_OBJ, 0,                  LIPS_1d,     6, CYCLE_FORWARD}; -act1 amdoor1_1d      = {START_OBJ, 1 * NORMAL_TPS,     MDOOR_1d,    1, CYCLE_FORWARD}; -act1 amovecarp1_1d   = {START_OBJ, 0,                  CARPET_1d,   0, ALMOST_INVISIBLE}; -act1 amovecarp2_1d   = {START_OBJ, 0,                  TRAP_1d,     0, NOT_CYCLING}; -act1 amum1_1d        = {START_OBJ, 2 * NORMAL_TPS,     MUMMY_1d,    0, CYCLE_FORWARD}; -act1 aopendoor1_1d   = {START_OBJ, 1 * NORMAL_TPS,     DOOR1_1d,    1, CYCLE_FORWARD}; -act1 aopendoor2_1d   = {START_OBJ, 1 * NORMAL_TPS,     DOOR2_1d,    1, CYCLE_FORWARD}; -act1 aopendoor3_1d   = {START_OBJ, 1 * NORMAL_TPS,     DOOR3_1d,    1, CYCLE_FORWARD}; -act1 aopendoor4_1d   = {START_OBJ, 1 * NORMAL_TPS,     DOOR4_1d,    1, CYCLE_FORWARD}; -act1 aopenwdoorl_1d  = {START_OBJ, 1 * NORMAL_TPS,     WDOORL_1d,   1, CYCLE_FORWARD}; -act1 aopenwdoorr_1d  = {START_OBJ, 1 * NORMAL_TPS,     WDOORR_1d,   1, CYCLE_FORWARD}; -act1 aridpkin_1d     = {START_OBJ, 0,                  PKIN_1d,     0, ALMOST_INVISIBLE}; -act1 aridprof_1d     = {START_OBJ, 130 / DX,           PROF_1d,     0, ALMOST_INVISIBLE}; -act1 ashowkey_1d     = {START_OBJ, 0,                  KEY_1d,      0, NOT_CYCLING}; - -act2 achopxy_1d     = {INIT_OBJXY, 0,                   CHOP_1d, 51,  155}; -act2 aigor12_1d     = {INIT_OBJXY, 30,                  HERO,    116, 112}; -act2 a115d_1d       = {INIT_OBJXY, 0,                   MASK_1d, 240, 88}; -act2 abata1c_1d     = {INIT_OBJXY, 0,                   BAT2_1d, 65,  25}; -act2 abata2c_1d     = {INIT_OBJXY, 0,                   BAT3_1d, 55,  65}; -act2 abata3c_1d     = {INIT_OBJXY, 0,                   BAT4_1d, 50,  120}; -act2 abata4c_1d     = {INIT_OBJXY, 0,                   BAT5_1d, 55,  130}; -act2 abox4a_1d      = {INIT_OBJXY, 20,                  HERO,    124, 122}; -act2 adog4_1d       = {INIT_OBJXY, 0,                   DOG_1d,  105, 119}; -act2 aheroxy78_1d   = {INIT_OBJXY, 1 * NORMAL_TPS + 12, HERO,    80,  42}; -act2 alab2_1d       = {INIT_OBJXY, 0,                   PROF_1d, 100, 130}; -act2 abatxy_1d      = {INIT_OBJXY, 0,                   BAT_1d,  95,  55}; -act2 ahchase2_1d    = {INIT_OBJXY, 5 * NORMAL_TPS,      DOG_1d,  280, 137}; -act2 aherofar_1d    = {INIT_OBJXY, 0,                   HERO,    142, 25}; -act2 aheronear_1d   = {INIT_OBJXY, 0,                   HERO,    230, 132}; -act2 aheroxy01_1d   = {INIT_OBJXY, 0,                   HERO,    106, 130}; -act2 aheroxy10_1d   = {INIT_OBJXY, 0,                   HERO,    33,  134}; -act2 aheroxy1011_1d = {INIT_OBJXY, 0,                   HERO,    76,  130}; -act2 aheroxy109_1d  = {INIT_OBJXY, 0,                   HERO,    96,  105}; -act2 aheroxy1110_1d = {INIT_OBJXY, 0,                   HERO,    261, 77}; -act2 aheroxy1112_1d = {INIT_OBJXY, 0,                   HERO,    216, 134}; -act2 aheroxy115_1d  = {INIT_OBJXY, 1,                   HERO,    27,  130}; -act2 aheroxy12_1d   = {INIT_OBJXY, 1 * NORMAL_TPS + 12, HERO,    169, 90}; -act2 aheroxy1211_1d = {INIT_OBJXY, 0,                   HERO,    291, 42}; -act2 aheroxy1213_1d = {INIT_OBJXY, 0,                   HERO,    131, 110}; -act2 aheroxy13_1d   = {INIT_OBJXY, 0,                   HERO,    40,  127}; -act2 aheroxy14_1d   = {INIT_OBJXY, 1 * NORMAL_TPS + 12, HERO,    135, 115}; -act2 aheroxy15_1d   = {INIT_OBJXY, 0,                   HERO,    270, 120}; -act2 aheroxy151_1d  = {INIT_OBJXY, 0,                   HERO,    240, 55}; -act2 aheroxy21_1d   = {INIT_OBJXY, 0,                   HERO,    130, 56}; -act2 aheroxy31_1d   = {INIT_OBJXY, 0,                   HERO,    263, 126}; -act2 aheroxy35_1d   = {INIT_OBJXY, 0,                   HERO,    253, 96}; -act2 aheroxy41_1d   = {INIT_OBJXY, 0,                   HERO,    200, 56}; -act2 aheroxy51_1d   = {INIT_OBJXY, 0,                   HERO,    200, 110}; -act2 aheroxy53_1d   = {INIT_OBJXY, 0,                   HERO,    50,  90}; -act2 aheroxy56_1d   = {INIT_OBJXY, 0,                   HERO,    290, 140}; -act2 aheroxy57_1d   = {INIT_OBJXY, 0,                   HERO,    255, 107}; -act2 aheroxy65_1d   = {INIT_OBJXY, 0,                   HERO,    215, 96}; -act2 aheroxy75_1d   = {INIT_OBJXY, 0,                   HERO,    20,  110}; -act2 aheroxy87_1d   = {INIT_OBJXY, 0,                   HERO,    235, 108}; -act2 aheroxy89_1d   = {INIT_OBJXY, 0,                   HERO,    276, 135}; -act2 aheroxy910_1d  = {INIT_OBJXY, 0,                   HERO,    50,  132}; -act2 aheroxy98_1d   = {INIT_OBJXY, 0,                   HERO,    130, 120}; -act2 akchase2_1d    = {INIT_OBJXY, 5 * NORMAL_TPS,      DOG_1d,  30,  120}; - -act3 abut4_1d =  {PROMPT, 0,                   kSTsbut1_1d,   repbut2_1d, kALbutyes_1d,  kALbutno_1d,  false}; -act3 ahelp1_1d = {PROMPT, 4 * 60 * NORMAL_TPS, kSTshelpp1_1d, repbut2_1d, kALhelpy_1d,   kALhelpn_1d,  false}; -act3 ahelp2_1d = {PROMPT, 5 * 60 * NORMAL_TPS, kSTshelpp2_1d, repbut2_1d, kALhelpy2_1d,  kALhelpn_1d,  false}; -act3 amanq1_1d = {PROMPT, 0,                   kSTsq1_1d,     rep1_1d,    kALrepyes1_1d, kALrepno1_1d, true}; -act3 amanq2_1d = {PROMPT, 0,                   kSTsq2_1d,     rep2_1d,    kALrepyes2_1d, kALrepno1_1d, true}; -act3 amanq3_1d = {PROMPT, 0,                   kSTsq3_1d,     rep3_1d,    kALrepyes3_1d, kALrepno1_1d, true}; -act3 amanq4_1d = {PROMPT, 0,                   kSTsq4_1d,     rep4_1d,    kALrepyes4_1d, kALrepno1_1d, true}; -act3 amanq5_1d = {PROMPT, 0,                   kSTsq5_1d,     rep5_1d,    kALrepyes5_1d, kALrepno1_1d, true}; -act3 amanq6_1d = {PROMPT, 0,                   kSTsq6_1d,     rep6_1d,    kALrepyes6_1d, kALrepno1_1d, true}; -act3 amanq7_1d = {PROMPT, 0,                   kSTsq7_1d,     repbut2_1d, kALrepyes7_1d, kALrepno3_1d, false}; -act3 aopenp_1d = {PROMPT, 0,                   kSTsopenp_1d,  repopen_1d, kALopenyes_1d, kALopenno_1d, false}; +act0 aend_1d       = {ASCHEDULE, 4 * NORMAL_TPS_v1d,  kALend_1d}; +act0 ajailrep_1d   = {ASCHEDULE, 4,                   kALjailrep_1d}; +act0 acycle_1d     = {ASCHEDULE, 0,                   kALcycle_1d}; +act0 areparm_1d    = {ASCHEDULE, 5 * NORMAL_TPS_v1d,  kALreparm_1d}; +act0 arepbat_1d    = {ASCHEDULE, 12 * NORMAL_TPS_v1d, kALbat_1d}; +act0 arepbata_1d   = {ASCHEDULE, 3 * NORMAL_TPS_v1d,  kALbatrep_1d}; +act0 arepeye_1d    = {ASCHEDULE, 8 * NORMAL_TPS_v1d,  kALblinkeyes1_1d}; +act0 arepeye2_1d   = {ASCHEDULE, 8 * NORMAL_TPS_v1d,  kALblinkeyes2_1d}; +act0 areplight_1d  = {ASCHEDULE, 11 * NORMAL_TPS_v1d, kALightning_1d}; +act0 areplips_1d   = {ASCHEDULE, 4 * NORMAL_TPS_v1d,  kALreplips_1d}; +act0 arepredeye_1d = {ASCHEDULE, 6 * NORMAL_TPS_v1d,  kALrepredeye_1d}; +act0 aweird_1d     = {ASCHEDULE, 16,                  kALweird_1d}; + +act1 aridchop_1d     = {START_OBJ, 0,                      CHOP_1d,     0, ALMOST_INVISIBLE}; +act1 ashowchop_1d    = {START_OBJ, 0,                      CHOP_1d,     0, NOT_CYCLING}; +act1 a115b_1d        = {START_OBJ, 0,                      MASK_1d,     0, NOT_CYCLING}; +act1 abin2_1d        = {START_OBJ, 0,                      HERO,        0, ALMOST_INVISIBLE}; +act1 about2_1d       = {START_OBJ, 0,                      HERO,        0, NOT_CYCLING}; +act1 abox10_1d       = {START_OBJ, 38,                     PROF_1d,     0, CYCLE_FORWARD}; +act1 abox11_1d       = {START_OBJ, 73,                     PROF_1d,     0, ALMOST_INVISIBLE}; +act1 abut6d_1d       = {START_OBJ, 7,                      HERO,        0, ALMOST_INVISIBLE}; +act1 abut6f_1d       = {START_OBJ, 7,                      HDLSHERO_1d, 0, NOT_CYCLING}; +act1 aclosetrap_1d   = {START_OBJ, 1 * NORMAL_TPS_v1d,     TRAP_1d,     1, CYCLE_BACKWARD}; +act1 adogcyc_1d      = {START_OBJ, 0,                      DOG_1d,      0, CYCLE_FORWARD}; +act1 adoggy1_1d      = {START_OBJ, 0,                      HERO,        0, ALMOST_INVISIBLE}; +act1 adoggy3_1d      = {START_OBJ, 0,                      HERODEAD_1d, 0, NOT_CYCLING}; +act1 aguardgo1_1d    = {START_OBJ, 0,                      GUARD_1d,    0, CYCLE_FORWARD}; +act1 ajail2_1d       = {START_OBJ, 0,                      HERO,        0, CYCLE_FORWARD}; +act1 alab5_1d        = {START_OBJ, 0,                      PROF_1d,     0, CYCLE_FORWARD}; +act1 alab8_1d        = {START_OBJ, 12,                     PROF_1d,     0, NOT_CYCLING}; +act1 alab9_1d        = {START_OBJ, 16,                     IGOR_1d,     0, NOT_CYCLING}; +act1 aopentrap_1d    = {START_OBJ, 1 * NORMAL_TPS_v1d,     TRAP_1d,     1, CYCLE_FORWARD}; +act1 aridbung_1d     = {START_OBJ, 0,                      BUNG_1d,     0, ALMOST_INVISIBLE}; +act1 atheend1_1d     = {START_OBJ, 5 * NORMAL_TPS_v1d,     HERO,        0, ALMOST_INVISIBLE}; +act1 aarm_1d         = {START_OBJ, 0,                      ARM_1d,      3, CYCLE_BACKWARD}; +act1 ablink1a_1d     = {START_OBJ, 0,                      EYES1_1d,    0, ALMOST_INVISIBLE}; +act1 ablink1b_1d     = {START_OBJ, 1,                      EYES1_1d,    0, NOT_CYCLING}; +act1 ablink1c_1d     = {START_OBJ, 2,                      EYES1_1d,    0, ALMOST_INVISIBLE}; +act1 ablink1d_1d     = {START_OBJ, 3,                      EYES1_1d,    0, NOT_CYCLING}; +act1 ablink2a_1d     = {START_OBJ, 3 * NORMAL_TPS_v1d + 0, EYES2_1d,    0, ALMOST_INVISIBLE}; +act1 ablink2b_1d     = {START_OBJ, 3 * NORMAL_TPS_v1d + 1, EYES2_1d,    0, NOT_CYCLING}; +act1 ablink2c_1d     = {START_OBJ, 3 * NORMAL_TPS_v1d + 2, EYES2_1d,    0, ALMOST_INVISIBLE}; +act1 ablink2d_1d     = {START_OBJ, 3 * NORMAL_TPS_v1d + 3, EYES2_1d,    0, NOT_CYCLING}; +act1 ablink3a_1d     = {START_OBJ, 0,                      EYES3_1d,    0, ALMOST_INVISIBLE}; +act1 ablink3b_1d     = {START_OBJ, 1,                      EYES3_1d,    0, NOT_CYCLING}; +act1 ablink3c_1d     = {START_OBJ, 2,                      EYES3_1d,    0, ALMOST_INVISIBLE}; +act1 ablink3d_1d     = {START_OBJ, 3,                      EYES3_1d,    0, NOT_CYCLING}; +act1 ablink4a_1d     = {START_OBJ, 3 * NORMAL_TPS_v1d + 0, EYES4_1d,    0, ALMOST_INVISIBLE}; +act1 ablink4b_1d     = {START_OBJ, 3 * NORMAL_TPS_v1d + 1, EYES4_1d,    0, NOT_CYCLING}; +act1 ablink4c_1d     = {START_OBJ, 3 * NORMAL_TPS_v1d + 2, EYES4_1d,    0, ALMOST_INVISIBLE}; +act1 ablink4d_1d     = {START_OBJ, 3 * NORMAL_TPS_v1d + 3, EYES4_1d,    0, NOT_CYCLING}; +act1 ablink5a_1d     = {START_OBJ, 0,                      REDEYES_1d,  0, ALMOST_INVISIBLE}; +act1 ablink5b_1d     = {START_OBJ, 1,                      REDEYES_1d,  0, NOT_CYCLING}; +act1 ablink5c_1d     = {START_OBJ, 2,                      REDEYES_1d,  0, ALMOST_INVISIBLE}; +act1 ablink5d_1d     = {START_OBJ, 3,                      REDEYES_1d,  0, NOT_CYCLING}; +act1 abut1_1d        = {START_OBJ, 4 * NORMAL_TPS_v1d,     BUTLER_1d,   0, CYCLE_FORWARD}; +act1 aclosedoor1_1d  = {START_OBJ, 1 * NORMAL_TPS_v1d,     DOOR1_1d,    1, CYCLE_BACKWARD}; +act1 aclosedoor4_1d  = {START_OBJ, 1 * NORMAL_TPS_v1d,     DOOR4_1d,    1, CYCLE_BACKWARD}; +act1 aclosewdoorl_1d = {START_OBJ, 1 * NORMAL_TPS_v1d,     WDOORL_1d,   1, CYCLE_BACKWARD}; +act1 aclosewdoorr_1d = {START_OBJ, 1 * NORMAL_TPS_v1d,     WDOORR_1d,   1, CYCLE_BACKWARD}; +act1 adog1_1d        = {START_OBJ, 0,                      DOG_1d,      0, CYCLE_FORWARD}; +act1 alips_1d        = {START_OBJ, 0,                      LIPS_1d,     6, CYCLE_FORWARD}; +act1 amdoor1_1d      = {START_OBJ, 1 * NORMAL_TPS_v1d,     MDOOR_1d,    1, CYCLE_FORWARD}; +act1 amovecarp1_1d   = {START_OBJ, 0,                      CARPET_1d,   0, ALMOST_INVISIBLE}; +act1 amovecarp2_1d   = {START_OBJ, 0,                      TRAP_1d,     0, NOT_CYCLING}; +act1 amum1_1d        = {START_OBJ, 2 * NORMAL_TPS_v1d,     MUMMY_1d,    0, CYCLE_FORWARD}; +act1 aopendoor1_1d   = {START_OBJ, 1 * NORMAL_TPS_v1d,     DOOR1_1d,    1, CYCLE_FORWARD}; +act1 aopendoor2_1d   = {START_OBJ, 1 * NORMAL_TPS_v1d,     DOOR2_1d,    1, CYCLE_FORWARD}; +act1 aopendoor3_1d   = {START_OBJ, 1 * NORMAL_TPS_v1d,     DOOR3_1d,    1, CYCLE_FORWARD}; +act1 aopendoor4_1d   = {START_OBJ, 1 * NORMAL_TPS_v1d,     DOOR4_1d,    1, CYCLE_FORWARD}; +act1 aopenwdoorl_1d  = {START_OBJ, 1 * NORMAL_TPS_v1d,     WDOORL_1d,   1, CYCLE_FORWARD}; +act1 aopenwdoorr_1d  = {START_OBJ, 1 * NORMAL_TPS_v1d,     WDOORR_1d,   1, CYCLE_FORWARD}; +act1 aridpkin_1d     = {START_OBJ, 0,                      PKIN_1d,     0, ALMOST_INVISIBLE}; +act1 aridprof_1d     = {START_OBJ, 130 / DX,               PROF_1d,     0, ALMOST_INVISIBLE}; +act1 ashowkey_1d     = {START_OBJ, 0,                      KEY_1d,      0, NOT_CYCLING}; + +act2 achopxy_1d     = {INIT_OBJXY, 0,                       CHOP_1d, 51,  155}; +act2 aigor12_1d     = {INIT_OBJXY, 30,                      HERO,    116, 112}; +act2 a115d_1d       = {INIT_OBJXY, 0,                       MASK_1d, 240, 88}; +act2 abata1c_1d     = {INIT_OBJXY, 0,                       BAT2_1d, 65,  25}; +act2 abata2c_1d     = {INIT_OBJXY, 0,                       BAT3_1d, 55,  65}; +act2 abata3c_1d     = {INIT_OBJXY, 0,                       BAT4_1d, 50,  120}; +act2 abata4c_1d     = {INIT_OBJXY, 0,                       BAT5_1d, 55,  130}; +act2 abox4a_1d      = {INIT_OBJXY, 20,                      HERO,    124, 122}; +act2 adog4_1d       = {INIT_OBJXY, 0,                       DOG_1d,  105, 119}; +act2 aheroxy78_1d   = {INIT_OBJXY, 1 * NORMAL_TPS_v1d + 12, HERO,    80,  42}; +act2 alab2_1d       = {INIT_OBJXY, 0,                       PROF_1d, 100, 130}; +act2 abatxy_1d      = {INIT_OBJXY, 0,                       BAT_1d,  95,  55}; +act2 ahchase2_1d    = {INIT_OBJXY, 5 * NORMAL_TPS_v1d,      DOG_1d,  280, 137}; +act2 aherofar_1d    = {INIT_OBJXY, 0,                       HERO,    142, 25}; +act2 aheronear_1d   = {INIT_OBJXY, 0,                       HERO,    230, 132}; +act2 aheroxy01_1d   = {INIT_OBJXY, 0,                       HERO,    106, 130}; +act2 aheroxy10_1d   = {INIT_OBJXY, 0,                       HERO,    33,  134}; +act2 aheroxy1011_1d = {INIT_OBJXY, 0,                       HERO,    76,  130}; +act2 aheroxy109_1d  = {INIT_OBJXY, 0,                       HERO,    96,  105}; +act2 aheroxy1110_1d = {INIT_OBJXY, 0,                       HERO,    261, 77}; +act2 aheroxy1112_1d = {INIT_OBJXY, 0,                       HERO,    216, 134}; +act2 aheroxy115_1d  = {INIT_OBJXY, 1,                       HERO,    27,  130}; +act2 aheroxy12_1d   = {INIT_OBJXY, 1 * NORMAL_TPS_v1d + 12, HERO,    169, 90}; +act2 aheroxy1211_1d = {INIT_OBJXY, 0,                       HERO,    291, 42}; +act2 aheroxy1213_1d = {INIT_OBJXY, 0,                       HERO,    131, 110}; +act2 aheroxy13_1d   = {INIT_OBJXY, 0,                       HERO,    40,  127}; +act2 aheroxy14_1d   = {INIT_OBJXY, 1 * NORMAL_TPS_v1d + 12, HERO,    135, 115}; +act2 aheroxy15_1d   = {INIT_OBJXY, 0,                       HERO,    270, 120}; +act2 aheroxy151_1d  = {INIT_OBJXY, 0,                       HERO,    240, 55}; +act2 aheroxy21_1d   = {INIT_OBJXY, 0,                       HERO,    130, 56}; +act2 aheroxy31_1d   = {INIT_OBJXY, 0,                       HERO,    263, 126}; +act2 aheroxy35_1d   = {INIT_OBJXY, 0,                       HERO,    253, 96}; +act2 aheroxy41_1d   = {INIT_OBJXY, 0,                       HERO,    200, 56}; +act2 aheroxy51_1d   = {INIT_OBJXY, 0,                       HERO,    200, 110}; +act2 aheroxy53_1d   = {INIT_OBJXY, 0,                       HERO,    50,  90}; +act2 aheroxy56_1d   = {INIT_OBJXY, 0,                       HERO,    290, 140}; +act2 aheroxy57_1d   = {INIT_OBJXY, 0,                       HERO,    255, 107}; +act2 aheroxy65_1d   = {INIT_OBJXY, 0,                       HERO,    215, 96}; +act2 aheroxy75_1d   = {INIT_OBJXY, 0,                       HERO,    20,  110}; +act2 aheroxy87_1d   = {INIT_OBJXY, 0,                       HERO,    235, 108}; +act2 aheroxy89_1d   = {INIT_OBJXY, 0,                       HERO,    276, 135}; +act2 aheroxy910_1d  = {INIT_OBJXY, 0,                       HERO,    50,  132}; +act2 aheroxy98_1d   = {INIT_OBJXY, 0,                       HERO,    130, 120}; +act2 akchase2_1d    = {INIT_OBJXY, 5 * NORMAL_TPS_v1d,      DOG_1d,  30,  120}; + +act3 abut4_1d =  {PROMPT, 0,                       kSTsbut1_1d,   repbut2_1d, kALbutyes_1d,  kALbutno_1d,  false}; +act3 ahelp1_1d = {PROMPT, 4 * 60 * NORMAL_TPS_v1d, kSTshelpp1_1d, repbut2_1d, kALhelpy_1d,   kALhelpn_1d,  false}; +act3 ahelp2_1d = {PROMPT, 5 * 60 * NORMAL_TPS_v1d, kSTshelpp2_1d, repbut2_1d, kALhelpy2_1d,  kALhelpn_1d,  false}; +act3 amanq1_1d = {PROMPT, 0,                       kSTsq1_1d,     rep1_1d,    kALrepyes1_1d, kALrepno1_1d, true}; +act3 amanq2_1d = {PROMPT, 0,                       kSTsq2_1d,     rep2_1d,    kALrepyes2_1d, kALrepno1_1d, true}; +act3 amanq3_1d = {PROMPT, 0,                       kSTsq3_1d,     rep3_1d,    kALrepyes3_1d, kALrepno1_1d, true}; +act3 amanq4_1d = {PROMPT, 0,                       kSTsq4_1d,     rep4_1d,    kALrepyes4_1d, kALrepno1_1d, true}; +act3 amanq5_1d = {PROMPT, 0,                       kSTsq5_1d,     rep5_1d,    kALrepyes5_1d, kALrepno1_1d, true}; +act3 amanq6_1d = {PROMPT, 0,                       kSTsq6_1d,     rep6_1d,    kALrepyes6_1d, kALrepno1_1d, true}; +act3 amanq7_1d = {PROMPT, 0,                       kSTsq7_1d,     repbut2_1d, kALrepyes7_1d, kALrepno3_1d, false}; +act3 aopenp_1d = {PROMPT, 0,                       kSTsopenp_1d,  repopen_1d, kALopenyes_1d, kALopenno_1d, false};  act4 abg1_1d =     {BKGD_COLOR, 0,  _LIGHTYELLOW};  act4 abg2_1d =     {BKGD_COLOR, 2,  _LIGHTMAGENTA}; @@ -8927,36 +8929,36 @@ act4 abk2_1d =     {BKGD_COLOR, 2,  _BLUE};  act4 abknorm1_1d = {BKGD_COLOR, 0,  _BLACK};  act4 abknorm2_1d = {BKGD_COLOR, 3,  _BLACK}; -act5 abox0_1d =      {INIT_OBJVXY, 0,              GDOOR_1d,  6,      0}; -act5 abox1_1d =      {INIT_OBJVXY, 9,              GDOOR_1d,  0,      0}; -act5 abox7_1d =      {INIT_OBJVXY, 50,             GDOOR_1d,  -6,     0}; -act5 abox8_1d =      {INIT_OBJVXY, 57,             GDOOR_1d,  0,      0}; -act5 abox9_1d =      {INIT_OBJVXY, 38,             PROF_1d,   -DX,    0}; -act5 adoggy5_1d =    {INIT_OBJVXY, 0,              HERO,      0,      0}; -act5 aguardgo3_1d =  {INIT_OBJVXY, 0,              GUARD_1d,  -DX,    0}; -act5 ahin2_1d =      {INIT_OBJVXY, 0,              HERO,      0,      0};     // Stop hero! -act5 alab3_1d =      {INIT_OBJVXY, 0,              PROF_1d,   DX,     0}; -act5 alab6_1d =      {INIT_OBJVXY, 12,             PROF_1d,   0,      0}; -act5 alab7_1d =      {INIT_OBJVXY, 16,             IGOR_1d,   0,      0}; -act5 abatvxy1_1d =   {INIT_OBJVXY, 0,              BAT_1d,    2,      -2}; -act5 abatvxy2_1d =   {INIT_OBJVXY, 20,             BAT_1d,    -1,     1}; -act5 abatvxy3_1d =   {INIT_OBJVXY, 40,             BAT_1d,    -1,     -1}; -act5 abatvxy4_1d =   {INIT_OBJVXY, 50,             BAT_1d,    -5,     0}; -act5 abatvxy5_1d =   {INIT_OBJVXY, 60,             BAT_1d,    0,      0}; -act5 aboatvxy1_1d =  {INIT_OBJVXY, 0,              BOAT_1w,   0,      -2}; -act5 aboatvxy10_1d = {INIT_OBJVXY, 0,              BOAT_1w,   9,      7}; -act5 aboatvxy11_1d = {INIT_OBJVXY, 3,              BOAT_1w,   0,      0}; -act5 aboatvxy12_1d = {INIT_OBJVXY, 10,             BOAT_1w,   1,      1}; -act5 aboatvxy2_1d =  {INIT_OBJVXY, 10,             BOAT_1w,   -5,     0}; -act5 aboatvxy3_1d =  {INIT_OBJVXY, 20,             BOAT_1w,   2,      0}; -act5 aboatvxy4_1d =  {INIT_OBJVXY, 50,             BOAT_1w,   1,      -1}; -act5 aboatvxy5_1d =  {INIT_OBJVXY, 60,             BOAT_1w,   -2,     -3}; -act5 aboatvxy6_1d =  {INIT_OBJVXY, 70,             BOAT_1w,   -3,     0}; -act5 aboatvxy7_1d =  {INIT_OBJVXY, 100,            BOAT_1w,   0,      -3}; -act5 aboatvxy8_1d =  {INIT_OBJVXY, 104,            BOAT_1w,   -1,     -1}; -act5 aboatvxy9_1d =  {INIT_OBJVXY, 107,            BOAT_1w,   0,      0}; -act5 abutvxy1_1d =   {INIT_OBJVXY, 4 * NORMAL_TPS, BUTLER_1d, DX - 2, 0}; -act5 astophero_1d =  {INIT_OBJVXY, 0,              HERO,      0,      0};     // Stop hero! +act5 abox0_1d =      {INIT_OBJVXY, 0,                  GDOOR_1d,  6,      0}; +act5 abox1_1d =      {INIT_OBJVXY, 9,                  GDOOR_1d,  0,      0}; +act5 abox7_1d =      {INIT_OBJVXY, 50,                 GDOOR_1d,  -6,     0}; +act5 abox8_1d =      {INIT_OBJVXY, 57,                 GDOOR_1d,  0,      0}; +act5 abox9_1d =      {INIT_OBJVXY, 38,                 PROF_1d,   -DX,    0}; +act5 adoggy5_1d =    {INIT_OBJVXY, 0,                  HERO,      0,      0}; +act5 aguardgo3_1d =  {INIT_OBJVXY, 0,                  GUARD_1d,  -DX,    0}; +act5 ahin2_1d =      {INIT_OBJVXY, 0,                  HERO,      0,      0};     // Stop hero! +act5 alab3_1d =      {INIT_OBJVXY, 0,                  PROF_1d,   DX,     0}; +act5 alab6_1d =      {INIT_OBJVXY, 12,                 PROF_1d,   0,      0}; +act5 alab7_1d =      {INIT_OBJVXY, 16,                 IGOR_1d,   0,      0}; +act5 abatvxy1_1d =   {INIT_OBJVXY, 0,                  BAT_1d,    2,      -2}; +act5 abatvxy2_1d =   {INIT_OBJVXY, 20,                 BAT_1d,    -1,     1}; +act5 abatvxy3_1d =   {INIT_OBJVXY, 40,                 BAT_1d,    -1,     -1}; +act5 abatvxy4_1d =   {INIT_OBJVXY, 50,                 BAT_1d,    -5,     0}; +act5 abatvxy5_1d =   {INIT_OBJVXY, 60,                 BAT_1d,    0,      0}; +act5 aboatvxy1_1d =  {INIT_OBJVXY, 0,                  BOAT_1w,   0,      -2}; +act5 aboatvxy10_1d = {INIT_OBJVXY, 0,                  BOAT_1w,   9,      7}; +act5 aboatvxy11_1d = {INIT_OBJVXY, 3,                  BOAT_1w,   0,      0}; +act5 aboatvxy12_1d = {INIT_OBJVXY, 10,                 BOAT_1w,   1,      1}; +act5 aboatvxy2_1d =  {INIT_OBJVXY, 10,                 BOAT_1w,   -5,     0}; +act5 aboatvxy3_1d =  {INIT_OBJVXY, 20,                 BOAT_1w,   2,      0}; +act5 aboatvxy4_1d =  {INIT_OBJVXY, 50,                 BOAT_1w,   1,      -1}; +act5 aboatvxy5_1d =  {INIT_OBJVXY, 60,                 BOAT_1w,   -2,     -3}; +act5 aboatvxy6_1d =  {INIT_OBJVXY, 70,                 BOAT_1w,   -3,     0}; +act5 aboatvxy7_1d =  {INIT_OBJVXY, 100,                BOAT_1w,   0,      -3}; +act5 aboatvxy8_1d =  {INIT_OBJVXY, 104,                BOAT_1w,   -1,     -1}; +act5 aboatvxy9_1d =  {INIT_OBJVXY, 107,                BOAT_1w,   0,      0}; +act5 abutvxy1_1d =   {INIT_OBJVXY, 4 * NORMAL_TPS_v1d, BUTLER_1d, DX - 2, 0}; +act5 astophero_1d =  {INIT_OBJVXY, 0,                  HERO,      0,      0};     // Stop hero!  act6 adropchop_1d = {INIT_CARRY, 0, CHOP_1d, false};  act6 a115c_1d =     {INIT_CARRY, 0, MASK_1d, false}; @@ -8965,19 +8967,19 @@ act6 adropbung_1d = {INIT_CARRY, 0, BUNG_1d, false};  act6 adropmask_1d = {INIT_CARRY, 0, MASK_1d, false};  act6 adroppkin_1d = {INIT_CARRY, 0, PKIN_1d, false}; -act7 abut6e_1d =   {INIT_HH_COORD, 7,              HDLSHERO_1d}; // Remove hero's head -act7 adoggy2_1d =  {INIT_HH_COORD, 0,              HERODEAD_1d}; -act7 ahchase1_1d = {INIT_HF_COORD, 5 * NORMAL_TPS, DOG_1d};// Set screen to hero's -act7 akchase1_1d = {INIT_HF_COORD, 5 * NORMAL_TPS, DOG_1d}; // Set screen to hero's -act7 amovekey_1d = {INIT_HF_COORD, 0,              KEY_1d}; // Move key to hero's coords +act7 abut6e_1d =   {INIT_HH_COORD, 7,                  HDLSHERO_1d}; // Remove hero's head +act7 adoggy2_1d =  {INIT_HH_COORD, 0,                  HERODEAD_1d}; +act7 ahchase1_1d = {INIT_HF_COORD, 5 * NORMAL_TPS_v1d, DOG_1d};      // Set screen to hero's +act7 akchase1_1d = {INIT_HF_COORD, 5 * NORMAL_TPS_v1d, DOG_1d};      // Set screen to hero's +act7 amovekey_1d = {INIT_HF_COORD, 0,                  KEY_1d};      // Move key to hero's coords  // Those two were originally defined as act11, but with the type INIT_HF_COORD  // They are now defined as act7 to silence GCC warnings. -act7 adog3_1d =    {INIT_HF_COORD, 0, DOG_1d};        // Set correct screen -act7 alab1_1d =    {INIT_HF_COORD, 0, PROF_1d};           // Set correct screen +act7 adog3_1d =    {INIT_HF_COORD, 0, DOG_1d};      // Set correct screen +act7 alab1_1d =    {INIT_HF_COORD, 0, PROF_1d};     // Set correct screen -act8 aopen78_1d  = {NEW_SCREEN, 1 * NORMAL_TPS + 12, 8}; // Goto to Basement -act8 atheend2_1d = {NEW_SCREEN, 5 * NORMAL_TPS,      14}; +act8 aopen78_1d  = {NEW_SCREEN, 1 * NORMAL_TPS_v1d + 12, 8}; // Goto to Basement +act8 atheend2_1d = {NEW_SCREEN, 5 * NORMAL_TPS_v1d,      14};  act8 ascr01_1d   = {NEW_SCREEN, 0,                   1};  act8 ascr10_1d   = {NEW_SCREEN, 0,                   0};  act8 ascr1011_1d = {NEW_SCREEN, 0,                   11}; @@ -8985,11 +8987,11 @@ act8 ascr109_1d  = {NEW_SCREEN, 0,                   9};  act8 ascr1110_1d = {NEW_SCREEN, 0,                   10};  act8 ascr1112_1d = {NEW_SCREEN, 0,                   12};  act8 ascr115_1d  = {NEW_SCREEN, 1,                   15};// Note delay for COND_CARRY -act8 ascr12_1d   = {NEW_SCREEN, 1 * NORMAL_TPS + 12, 2}; // Goto to Bed1 +act8 ascr12_1d   = {NEW_SCREEN, 1 * NORMAL_TPS_v1d + 12, 2}; // Goto to Bed1  act8 ascr1211_1d = {NEW_SCREEN, 0,                   11};  act8 ascr1213_1d = {NEW_SCREEN, 0,                   13};  act8 ascr13_1d   = {NEW_SCREEN, 0,                   3}; -act8 ascr14_1d   = {NEW_SCREEN, 1 * NORMAL_TPS + 12, 4}; // Goto to Bathroom +act8 ascr14_1d   = {NEW_SCREEN, 1 * NORMAL_TPS_v1d + 12, 4}; // Goto to Bathroom  act8 ascr15_1d   = {NEW_SCREEN, 0,                   5};  act8 ascr151_1d  = {NEW_SCREEN, 0,                   1};  act8 ascr21_1d   = {NEW_SCREEN, 0,                   1}; @@ -9007,53 +9009,53 @@ act8 ascr89_1d   = {NEW_SCREEN, 0,                   9};  act8 ascr910_1d  = {NEW_SCREEN, 0,                   10};  act8 ascr98_1d   = {NEW_SCREEN, 0,                   8}; -act9 aigor14_1d =     {INIT_OBJSTATE, 0,                   GDOOR_1d,  2}; // Box now in state 2 -act9 aigor23_1d =     {INIT_OBJSTATE, 0,                   GDOOR_1d,  3}; // Box now in state 3 -act9 aigor33_1d =     {INIT_OBJSTATE, 0,                   GDOOR_1d,  4}; // Box now in state 4 -act9 a115g_1d =       {INIT_OBJSTATE, 0,                   MASK_1d,   0};   // Say mask not worn! -act9 abox12_1d =      {INIT_OBJSTATE, 0,                   GDOOR_1d,  1}; // Box now in state 1 -act9 abut10_1d =      {INIT_OBJSTATE, 10 * NORMAL_TPS,     BUTLER_1d, 0}; // Ask again if we meet a bit later -act9 abut4a_1d =      {INIT_OBJSTATE, 0,                   BUTLER_1d, 1}; // Butler doesn't want to give chop -act9 abut7a_1d =      {INIT_OBJSTATE, 0,                   BUTLER_1d, 1};  // No more chops to give -act9 ahin1_1d =       {INIT_OBJSTATE, 0,                   HERO,      1}; -act9 ahout_1d =       {INIT_OBJSTATE, 0,                   HERO,      0}; -act9 ast78_1d =       {INIT_OBJSTATE, 1 * NORMAL_TPS + 12, TRAP_1d,   0}; // Close door after -act9 aboatfar_1d =    {INIT_OBJSTATE, 107,                 BOAT_1d,   1};   // Say boat on other side -act9 aboatmov_1d =    {INIT_OBJSTATE, 0,                   BOAT_1d,   2};     // Say boat moving -act9 aboatnear_1d =   {INIT_OBJSTATE, 13,                  BOAT_1d,   0};   // Say boat on near side -act9 aompass_1d =     {INIT_OBJSTATE, 0,                   OLDMAN_1d, 1};     // Oldman allows passage -act9 ashedoil_1d =    {INIT_OBJSTATE, 0,                   SHED_1d,   1}; -act9 ast01_1d =       {INIT_OBJSTATE, 0,                   DOOR1_1d,  1};   // Close door after hero! -act9 ast12_1d =       {INIT_OBJSTATE, 1 * NORMAL_TPS + 12, DOOR2_1d,  0};   // Close door after -act9 ast14_1d =       {INIT_OBJSTATE, 1 * NORMAL_TPS + 12, DOOR3_1d,  0};   // Close door after -act9 astatedoor4_1d = {INIT_OBJSTATE, 0,                   DOOR4_1d,  1};  // Change state to open - -act10 abata1a_1d  = {INIT_PATH, 0,              BAT2_1d,   CHASE,  DX * 2, DY * 2}; -act10 abata1b_1d  = {INIT_PATH, 7,              BAT2_1d,   WANDER, DX,     DY}; -act10 abata2a_1d  = {INIT_PATH, 0,              BAT3_1d,   CHASE,  DX * 2, DY * 2}; -act10 abata2b_1d  = {INIT_PATH, 6,              BAT3_1d,   WANDER, DX,     DY}; -act10 abata3a_1d  = {INIT_PATH, 0,              BAT4_1d,   CHASE,  DX * 2, DY * 2}; -act10 abata3b_1d  = {INIT_PATH, 5,              BAT4_1d,   WANDER, DX,     DY}; -act10 abata4a_1d  = {INIT_PATH, 0,              BAT5_1d,   CHASE,  DX * 2, DY * 2}; -act10 abata4b_1d  = {INIT_PATH, 4,              BAT5_1d,   WANDER, DX,     DY}; -act10 abin3_1d    = {INIT_PATH, 0,              HERO,      AUTO,   0,      0}; -act10 about3_1d   = {INIT_PATH, 0,              HERO,      USER,   0,      0}; -act10 abut2_1d    = {INIT_PATH, 8 * NORMAL_TPS, BUTLER_1d, CHASE,  DX - 2, DY - 2}; -act10 abut3_1d    = {INIT_PATH, 0,              HERO,      AUTO,   0,      0};     // Stop HERO and prompt -act10 abut8_1d    = {INIT_PATH, 0,              BUTLER_1d, WANDER, DX - 2, DY - 2}; -act10 abut9_1d    = {INIT_PATH, 0,              HERO,      USER,   0,      0}; -act10 acyc1_1d    = {INIT_PATH, 0,              HERO,      AUTO,   0,      0}; -act10 acyc2_1d    = {INIT_PATH, 57,             HERO,      USER,   0,      0}; -act10 adef2_1d    = {INIT_PATH, 1 * NORMAL_TPS, BAT2_1d,   WANDER, DX,     DY}; -act10 adef3_1d    = {INIT_PATH, 1 * NORMAL_TPS, BAT3_1d,   WANDER, DX,     DY}; -act10 adef4_1d    = {INIT_PATH, 1 * NORMAL_TPS, BAT4_1d,   WANDER, DX,     DY}; -act10 adef5_1d    = {INIT_PATH, 1 * NORMAL_TPS, BAT5_1d,   WANDER, DX,     DY}; -act10 adog2_1d    = {INIT_PATH, 0,              DOG_1d,    CHASE,  DX * 2, DY * 2}; -act10 ahchase3_1d = {INIT_PATH, 5 * NORMAL_TPS, DOG_1d,    CHASE,  DX * 2, DY * 2}; -act10 ajail1_1d   = {INIT_PATH, 0,              HERO,      AUTO,   0,      0};     // Stop user control -act10 akchase3_1d = {INIT_PATH, 5 * NORMAL_TPS, DOG_1d,    CHASE,  DX * 2, DY * 2}; -act10 alab14_1d   = {INIT_PATH, 40,             IGOR_1d,   WANDER, DX,     0}; -act10 amum2_1d    = {INIT_PATH, 3 * NORMAL_TPS, MUMMY_1d,  CHASE,  DX * 2, DY * 2}; +act9 aigor14_1d =     {INIT_OBJSTATE, 0,                       GDOOR_1d,  2};  // Box now in state 2 +act9 aigor23_1d =     {INIT_OBJSTATE, 0,                       GDOOR_1d,  3};  // Box now in state 3 +act9 aigor33_1d =     {INIT_OBJSTATE, 0,                       GDOOR_1d,  4};  // Box now in state 4 +act9 a115g_1d =       {INIT_OBJSTATE, 0,                       MASK_1d,   0};  // Say mask not worn! +act9 abox12_1d =      {INIT_OBJSTATE, 0,                       GDOOR_1d,  1};  // Box now in state 1 +act9 abut10_1d =      {INIT_OBJSTATE, 10 * NORMAL_TPS_v1d,     BUTLER_1d, 0};  // Ask again if we meet a bit later +act9 abut4a_1d =      {INIT_OBJSTATE, 0,                       BUTLER_1d, 1};  // Butler doesn't want to give chop +act9 abut7a_1d =      {INIT_OBJSTATE, 0,                       BUTLER_1d, 1};  // No more chops to give +act9 ahin1_1d =       {INIT_OBJSTATE, 0,                       HERO,      1}; +act9 ahout_1d =       {INIT_OBJSTATE, 0,                       HERO,      0}; +act9 ast78_1d =       {INIT_OBJSTATE, 1 * NORMAL_TPS_v1d + 12, TRAP_1d,   0};  // Close door after +act9 aboatfar_1d =    {INIT_OBJSTATE, 107,                     BOAT_1d,   1};  // Say boat on other side +act9 aboatmov_1d =    {INIT_OBJSTATE, 0,                       BOAT_1d,   2};  // Say boat moving +act9 aboatnear_1d =   {INIT_OBJSTATE, 13,                      BOAT_1d,   0};  // Say boat on near side +act9 aompass_1d =     {INIT_OBJSTATE, 0,                       OLDMAN_1d, 1};  // Oldman allows passage +act9 ashedoil_1d =    {INIT_OBJSTATE, 0,                       SHED_1d,   1}; +act9 ast01_1d =       {INIT_OBJSTATE, 0,                       DOOR1_1d,  1};  // Close door after hero! +act9 ast12_1d =       {INIT_OBJSTATE, 1 * NORMAL_TPS_v1d + 12, DOOR2_1d,  0};  // Close door after +act9 ast14_1d =       {INIT_OBJSTATE, 1 * NORMAL_TPS_v1d + 12, DOOR3_1d,  0};  // Close door after +act9 astatedoor4_1d = {INIT_OBJSTATE, 0,                       DOOR4_1d,  1};  // Change state to open + +act10 abata1a_1d  = {INIT_PATH, 0,                  BAT2_1d,   CHASE,  DX * 2, DY * 2}; +act10 abata1b_1d  = {INIT_PATH, 7,                  BAT2_1d,   WANDER, DX,     DY}; +act10 abata2a_1d  = {INIT_PATH, 0,                  BAT3_1d,   CHASE,  DX * 2, DY * 2}; +act10 abata2b_1d  = {INIT_PATH, 6,                  BAT3_1d,   WANDER, DX,     DY}; +act10 abata3a_1d  = {INIT_PATH, 0,                  BAT4_1d,   CHASE,  DX * 2, DY * 2}; +act10 abata3b_1d  = {INIT_PATH, 5,                  BAT4_1d,   WANDER, DX,     DY}; +act10 abata4a_1d  = {INIT_PATH, 0,                  BAT5_1d,   CHASE,  DX * 2, DY * 2}; +act10 abata4b_1d  = {INIT_PATH, 4,                  BAT5_1d,   WANDER, DX,     DY}; +act10 abin3_1d    = {INIT_PATH, 0,                  HERO,      AUTO,   0,      0}; +act10 about3_1d   = {INIT_PATH, 0,                  HERO,      USER,   0,      0}; +act10 abut2_1d    = {INIT_PATH, 8 * NORMAL_TPS_v1d, BUTLER_1d, CHASE,  DX - 2, DY - 2}; +act10 abut3_1d    = {INIT_PATH, 0,                  HERO,      AUTO,   0,      0};     // Stop HERO and prompt +act10 abut8_1d    = {INIT_PATH, 0,                  BUTLER_1d, WANDER, DX - 2, DY - 2}; +act10 abut9_1d    = {INIT_PATH, 0,                  HERO,      USER,   0,      0}; +act10 acyc1_1d    = {INIT_PATH, 0,                  HERO,      AUTO,   0,      0}; +act10 acyc2_1d    = {INIT_PATH, 57,                 HERO,      USER,   0,      0}; +act10 adef2_1d    = {INIT_PATH, 1 * NORMAL_TPS_v1d, BAT2_1d,   WANDER, DX,     DY}; +act10 adef3_1d    = {INIT_PATH, 1 * NORMAL_TPS_v1d, BAT3_1d,   WANDER, DX,     DY}; +act10 adef4_1d    = {INIT_PATH, 1 * NORMAL_TPS_v1d, BAT4_1d,   WANDER, DX,     DY}; +act10 adef5_1d    = {INIT_PATH, 1 * NORMAL_TPS_v1d, BAT5_1d,   WANDER, DX,     DY}; +act10 adog2_1d    = {INIT_PATH, 0,                  DOG_1d,    CHASE,  DX * 2, DY * 2}; +act10 ahchase3_1d = {INIT_PATH, 5 * NORMAL_TPS_v1d, DOG_1d,    CHASE,  DX * 2, DY * 2}; +act10 ajail1_1d   = {INIT_PATH, 0,                  HERO,      AUTO,   0,      0};     // Stop user control +act10 akchase3_1d = {INIT_PATH, 5 * NORMAL_TPS_v1d, DOG_1d,    CHASE,  DX * 2, DY * 2}; +act10 alab14_1d   = {INIT_PATH, 40,                 IGOR_1d,   WANDER, DX,     0}; +act10 amum2_1d    = {INIT_PATH, 3 * NORMAL_TPS_v1d, MUMMY_1d,  CHASE,  DX * 2, DY * 2};  act11 achkd0_1d =   {COND_R, 0,   GDOOR_1d,    0, kALok151_1d,      kALchkd1_1d};  act11 achkd1_1d =   {COND_R, 0,   GDOOR_1d,    1, kALdmsg1_1d,      kALchkd2_1d}; @@ -9083,77 +9085,77 @@ act11 atcup1_1d =   {COND_R, 0,   CUPBOARD_1d, 1, kALcuptxt1_1d,    kALlookcupb2  act11 atcup2_1d =   {COND_R, 0,   CUPBOARD_1d, 2, kALcuptxt2_1d,    kALcuptxt3_1d};  act11 atrap_1d =    {COND_R, 0,   BOLT_1d,     2, kALopenpass_1d,   kALopenfail_1d}; -act12 achopfail_1d =   {TEXT, 0,                  kSTsthrown_1d}; -act12 achopthrown_1d = {TEXT, 5 * NORMAL_TPS,     kSTsachopthrown_1d}; -act12 admsg1_1d =      {TEXT, 0,                  kSTsadmsg1_1d}; -act12 admsg2_1d =      {TEXT, 0,                  kSTsadmsg2_1d}; -act12 admsg3_1d =      {TEXT, 0,                  kSTsadmsg3_1d}; -act12 aeatchop_1d =    {TEXT, 0,                  kSTsaeatchop_1d}; -act12 agobox_1d =      {TEXT, 0,                  kSTsagobox_1d}; -act12 aigor0_1d =      {TEXT, 0,                  kSTsaigor0_1d}; -act12 aigor13_1d =     {TEXT, 0,                  kSTsaigor13_1d}; -act12 aigor22_1d =     {TEXT, 0,                  kSTsaigor22_1d}; -act12 aigor32_1d =     {TEXT, 0,                  kSTsaigor32_1d}; -act12 ainorm_1d =      {TEXT, 0,                  kSTsainorm_1d}; -act12 a115e_1d =       {TEXT, 0,                  kSTsa115e_1d}; -act12 abat5a_1d =      {TEXT, 0,                  kSTsabat5a_1d}; -act12 abat5b_1d =      {TEXT, 0,                  kSTsabat5b_1d}; -act12 abin0_1d =       {TEXT, 0,                  kSTokgen_1d}; -act12 ablowt_1d =      {TEXT, 3 * NORMAL_TPS,     kSTsablowt_1d}; -act12 abox2_1d =       {TEXT, 16,                 kSTsabox2_1d}; -act12 abox3_1d =       {TEXT, 16,                 kSTsabox3_1d}; -act12 abox5_1d =       {TEXT, 38,                 kSTsabox5_1d}; -act12 abox6_1d =       {TEXT, 44,                 kSTsabox6_1d}; -act12 abung1_1d =      {TEXT, 0,                  kSTsabung1_1d}; -act12 abut11_1d =      {TEXT, NORMAL_TPS / 3,     kSTsabut11_1d}; -act12 abut6a_1d =      {TEXT, 0,                  kSTsabut6a_1d}; -act12 abut6b_1d =      {TEXT, 3,                  kSTsabut6b_1d}; -act12 abut6c_1d =      {TEXT, 6,                  kSTsabut6c_1d}; -act12 abut9a_1d =      {TEXT, NORMAL_TPS / 3,     kSTsabut9a_1d}; -act12 abut9b_1d =      {TEXT, NORMAL_TPS / 3 + 1, kSTsabut9b_1d}; -act12 acuptxt0_1d =    {TEXT, 0,                  kSTsseepkdw_1d}; -act12 acuptxt1_1d =    {TEXT, 0,                  kSTsseedw_1d}; -act12 acuptxt2_1d =    {TEXT, 0,                  kSTsseepk_1d}; -act12 acuptxt3_1d =    {TEXT, 0,                  kSTsnosee_1d}; -act12 adef6_1d =       {TEXT, 1 * NORMAL_TPS,     kSTsdefbat1_1d}; -act12 adef7_1d =       {TEXT, 3 * NORMAL_TPS,     kSTsdefbat2_1d}; -act12 adoggy4_1d =     {TEXT, 0,                  kSTsadoggy4_1d}; -act12 adwwhy_1d =      {TEXT, 0,                  kSTsadwwhy_1d}; -act12 agive1_1d =      {TEXT, 0,                  kSTsagive1_1d}; -act12 agive2_1d =      {TEXT, 0,                  kSTsagive2_1d}; -act12 ahelps1_1d =     {TEXT, 0,                  kSTsahelps1_1d}; -act12 ahelps2_1d =     {TEXT, 0,                  kSTsahelps2_1d}; -act12 ahout1_1d =      {TEXT, 0,                  kSTokgen_1d}; -act12 ajails1_1d =     {TEXT, 0,                  kSTsajails1_1d}; -act12 ajails2_1d =     {TEXT, 0,                  kSTsajails2_1d}; -act12 ajails3_1d =     {TEXT, 0,                  kSTsajails3_1d}; -act12 ajails4_1d =     {TEXT, 0,                  kSTsajails4_1d}; -act12 alab12_1d =      {TEXT, 24,                 kSTsalab12_1d}; -act12 alab13_1d =      {TEXT, 24,                 kSTsalab13_1d}; -act12 amans1_1d =      {TEXT, 0,                  kSTsamans1_1d}; -act12 amans3_1d =      {TEXT, 0,                  kSTsamans3_1d}; -act12 amans4_1d =      {TEXT, 0,                  kSTsamans4_1d}; -act12 amans5_1d =      {TEXT, 0,                  kSTsamans5_1d}; -act12 amans6_1d =      {TEXT, 0,                  kSTsamans6_1d}; -act12 amans7_1d =      {TEXT, 0,                  kSTsamans7_1d}; -act12 amoving_1d =     {TEXT, 0,                  kSTsamoving_1d}; -act12 amum3_1d =       {TEXT, 0,                  kSTsabat5a_1d}; -act12 amum4_1d =       {TEXT, 0,                  kSTsamum4_1d}; -act12 anodeboat_1d =   {TEXT, 0,                  kSTsanodeboat_1d}; -act12 anogive_1d =     {TEXT, 0,                  kSTsanogive_1d}; -act12 anohelp_1d =     {TEXT, 0,                  kSTsanohelp_1d}; -act12 anoopen_1d =     {TEXT, 0,                  kSTsanoopen_1d}; -act12 anotcut_1d =     {TEXT, 0,                  kSTsanotcut_1d}; -act12 anought_1d =     {TEXT, 1 * NORMAL_TPS,     kSTsanought_1d}; -act12 aopen4_1d =      {TEXT, 0,                  kSTsaopen4_1d}; -act12 aopenfail_1d =   {TEXT, 0,                  kSTsaopenfail_1d}; -act12 apbreak_1d =     {TEXT, 0,                  kSTspbreak_1d}; -act12 arepno5_1d =     {TEXT, 0,                  kSTsarepno5_1d}; -act12 arepnop_1d =     {TEXT, 0,                  kSTsarepnop_1d}; -act12 arepyep_1d =     {TEXT, 0,                  kSTsarepyep_1d}; -act12 arepyep2_1d =    {TEXT, 0,                  kSTsarepyep2_1d}; -act12 at78a_1d =       {TEXT, 0,                  kSTsat78a_1d}; -act12 bye1_1d =        {TEXT, 2 * NORMAL_TPS,     kSTsabye1_1d}; +act12 achopfail_1d =   {TEXT, 0,                      kSTsthrown_1d}; +act12 achopthrown_1d = {TEXT, 5 * NORMAL_TPS_v1d,     kSTsachopthrown_1d}; +act12 admsg1_1d =      {TEXT, 0,                      kSTsadmsg1_1d}; +act12 admsg2_1d =      {TEXT, 0,                      kSTsadmsg2_1d}; +act12 admsg3_1d =      {TEXT, 0,                      kSTsadmsg3_1d}; +act12 aeatchop_1d =    {TEXT, 0,                      kSTsaeatchop_1d}; +act12 agobox_1d =      {TEXT, 0,                      kSTsagobox_1d}; +act12 aigor0_1d =      {TEXT, 0,                      kSTsaigor0_1d}; +act12 aigor13_1d =     {TEXT, 0,                      kSTsaigor13_1d}; +act12 aigor22_1d =     {TEXT, 0,                      kSTsaigor22_1d}; +act12 aigor32_1d =     {TEXT, 0,                      kSTsaigor32_1d}; +act12 ainorm_1d =      {TEXT, 0,                      kSTsainorm_1d}; +act12 a115e_1d =       {TEXT, 0,                      kSTsa115e_1d}; +act12 abat5a_1d =      {TEXT, 0,                      kSTsabat5a_1d}; +act12 abat5b_1d =      {TEXT, 0,                      kSTsabat5b_1d}; +act12 abin0_1d =       {TEXT, 0,                      kSTokgen_1d}; +act12 ablowt_1d =      {TEXT, 3 * NORMAL_TPS_v1d,     kSTsablowt_1d}; +act12 abox2_1d =       {TEXT, 16,                     kSTsabox2_1d}; +act12 abox3_1d =       {TEXT, 16,                     kSTsabox3_1d}; +act12 abox5_1d =       {TEXT, 38,                     kSTsabox5_1d}; +act12 abox6_1d =       {TEXT, 44,                     kSTsabox6_1d}; +act12 abung1_1d =      {TEXT, 0,                      kSTsabung1_1d}; +act12 abut11_1d =      {TEXT, NORMAL_TPS_v1d / 3,     kSTsabut11_1d}; +act12 abut6a_1d =      {TEXT, 0,                      kSTsabut6a_1d}; +act12 abut6b_1d =      {TEXT, 3,                      kSTsabut6b_1d}; +act12 abut6c_1d =      {TEXT, 6,                      kSTsabut6c_1d}; +act12 abut9a_1d =      {TEXT, NORMAL_TPS_v1d / 3,     kSTsabut9a_1d}; +act12 abut9b_1d =      {TEXT, NORMAL_TPS_v1d / 3 + 1, kSTsabut9b_1d}; +act12 acuptxt0_1d =    {TEXT, 0,                      kSTsseepkdw_1d}; +act12 acuptxt1_1d =    {TEXT, 0,                      kSTsseedw_1d}; +act12 acuptxt2_1d =    {TEXT, 0,                      kSTsseepk_1d}; +act12 acuptxt3_1d =    {TEXT, 0,                      kSTsnosee_1d}; +act12 adef6_1d =       {TEXT, 1 * NORMAL_TPS_v1d,     kSTsdefbat1_1d}; +act12 adef7_1d =       {TEXT, 3 * NORMAL_TPS_v1d,     kSTsdefbat2_1d}; +act12 adoggy4_1d =     {TEXT, 0,                      kSTsadoggy4_1d}; +act12 adwwhy_1d =      {TEXT, 0,                      kSTsadwwhy_1d}; +act12 agive1_1d =      {TEXT, 0,                      kSTsagive1_1d}; +act12 agive2_1d =      {TEXT, 0,                      kSTsagive2_1d}; +act12 ahelps1_1d =     {TEXT, 0,                      kSTsahelps1_1d}; +act12 ahelps2_1d =     {TEXT, 0,                      kSTsahelps2_1d}; +act12 ahout1_1d =      {TEXT, 0,                      kSTokgen_1d}; +act12 ajails1_1d =     {TEXT, 0,                      kSTsajails1_1d}; +act12 ajails2_1d =     {TEXT, 0,                      kSTsajails2_1d}; +act12 ajails3_1d =     {TEXT, 0,                      kSTsajails3_1d}; +act12 ajails4_1d =     {TEXT, 0,                      kSTsajails4_1d}; +act12 alab12_1d =      {TEXT, 24,                     kSTsalab12_1d}; +act12 alab13_1d =      {TEXT, 24,                     kSTsalab13_1d}; +act12 amans1_1d =      {TEXT, 0,                      kSTsamans1_1d}; +act12 amans3_1d =      {TEXT, 0,                      kSTsamans3_1d}; +act12 amans4_1d =      {TEXT, 0,                      kSTsamans4_1d}; +act12 amans5_1d =      {TEXT, 0,                      kSTsamans5_1d}; +act12 amans6_1d =      {TEXT, 0,                      kSTsamans6_1d}; +act12 amans7_1d =      {TEXT, 0,                      kSTsamans7_1d}; +act12 amoving_1d =     {TEXT, 0,                      kSTsamoving_1d}; +act12 amum3_1d =       {TEXT, 0,                      kSTsabat5a_1d}; +act12 amum4_1d =       {TEXT, 0,                      kSTsamum4_1d}; +act12 anodeboat_1d =   {TEXT, 0,                      kSTsanodeboat_1d}; +act12 anogive_1d =     {TEXT, 0,                      kSTsanogive_1d}; +act12 anohelp_1d =     {TEXT, 0,                      kSTsanohelp_1d}; +act12 anoopen_1d =     {TEXT, 0,                      kSTsanoopen_1d}; +act12 anotcut_1d =     {TEXT, 0,                      kSTsanotcut_1d}; +act12 anought_1d =     {TEXT, 1 * NORMAL_TPS_v1d,     kSTsanought_1d}; +act12 aopen4_1d =      {TEXT, 0,                      kSTsaopen4_1d}; +act12 aopenfail_1d =   {TEXT, 0,                      kSTsaopenfail_1d}; +act12 apbreak_1d =     {TEXT, 0,                      kSTspbreak_1d}; +act12 arepno5_1d =     {TEXT, 0,                      kSTsarepno5_1d}; +act12 arepnop_1d =     {TEXT, 0,                      kSTsarepnop_1d}; +act12 arepyep_1d =     {TEXT, 0,                      kSTsarepyep_1d}; +act12 arepyep2_1d =    {TEXT, 0,                      kSTsarepyep2_1d}; +act12 at78a_1d =       {TEXT, 0,                      kSTsat78a_1d}; +act12 bye1_1d =        {TEXT, 2 * NORMAL_TPS_v1d,     kSTsabye1_1d};  act13 aigor10_1d =   {SWAP_IMAGES, 30, HERO, WHERO_1d};  act13 aigor11_1d =   {SWAP_IMAGES, 30, HERO, SPACHERO_1d}; @@ -9173,32 +9175,32 @@ act14 acond9_1d =     {COND_SCR, 0, HERO, 9,  kALdefbats_1d,   kALnought_1d};  act15 adogchop_1d = {AUTOPILOT, 0, DOG_1d, CHOP_1d, DX + 2, DY * 2}; -act16 abin1_1d =       {INIT_OBJ_SEQ, 0,                   BOAT_1d,  1};    // Hero gets in boat -act16 about1_1d =      {INIT_OBJ_SEQ, 0,                   BOAT_1d,  0};    // Hero gets out of boat -act16 aclosedoor2_1d = {INIT_OBJ_SEQ, 1 * NORMAL_TPS + 12, DOOR2_1d, 0}; -act16 aclosedoor3_1d = {INIT_OBJ_SEQ, 1 * NORMAL_TPS + 12, DOOR3_1d, 0}; -act16 acutrope_1d =    {INIT_OBJ_SEQ, 0,                   ROPE_1d,  1}; -act16 adog5_1d =       {INIT_OBJ_SEQ, 0,                   DOG_1d,   0};       // Go right -act16 adogseq_1d =     {INIT_OBJ_SEQ, 0,                   DOG_1d,   1};  // Go left -act16 adogseq2_1d =    {INIT_OBJ_SEQ, 4 * NORMAL_TPS,      DOG_1d,   2}; // Sit up -act16 aguardgo2_1d =   {INIT_OBJ_SEQ, 0,                   GUARD_1d, 1}; -act16 ajail3_1d =      {INIT_OBJ_SEQ, 0,                   HERO,     0};        // Hero dances for joy! -act16 ajail4_1d =      {INIT_OBJ_SEQ, 2,                   HERO,     1}; -act16 alab10_1d =      {INIT_OBJ_SEQ, 14,                  PROF_1d,  1};     // Look to left -act16 alab11_1d =      {INIT_OBJ_SEQ, 18,                  IGOR_1d,  1};     // Look to left -act16 alab4_1d =       {INIT_OBJ_SEQ, 0,                   PROF_1d,  0};          // Walk to right -act16 at78c_1d =       {INIT_OBJ_SEQ, 1 * NORMAL_TPS + 12, TRAP_1d,  0};// Close trap -act16 aturnguard_1d =  {INIT_OBJ_SEQ, 2 * NORMAL_TPS,      GUARD_1d, 0}; +act16 abin1_1d =       {INIT_OBJ_SEQ, 0,                       BOAT_1d,  1}; // Hero gets in boat +act16 about1_1d =      {INIT_OBJ_SEQ, 0,                       BOAT_1d,  0}; // Hero gets out of boat +act16 aclosedoor2_1d = {INIT_OBJ_SEQ, 1 * NORMAL_TPS_v1d + 12, DOOR2_1d, 0}; +act16 aclosedoor3_1d = {INIT_OBJ_SEQ, 1 * NORMAL_TPS_v1d + 12, DOOR3_1d, 0}; +act16 acutrope_1d =    {INIT_OBJ_SEQ, 0,                       ROPE_1d,  1}; +act16 adog5_1d =       {INIT_OBJ_SEQ, 0,                       DOG_1d,   0}; // Go right +act16 adogseq_1d =     {INIT_OBJ_SEQ, 0,                       DOG_1d,   1}; // Go left +act16 adogseq2_1d =    {INIT_OBJ_SEQ, 4 * NORMAL_TPS_v1d,      DOG_1d,   2}; // Sit up +act16 aguardgo2_1d =   {INIT_OBJ_SEQ, 0,                       GUARD_1d, 1}; +act16 ajail3_1d =      {INIT_OBJ_SEQ, 0,                       HERO,     0}; // Hero dances for joy! +act16 ajail4_1d =      {INIT_OBJ_SEQ, 2,                       HERO,     1}; +act16 alab10_1d =      {INIT_OBJ_SEQ, 14,                      PROF_1d,  1}; // Look to left +act16 alab11_1d =      {INIT_OBJ_SEQ, 18,                      IGOR_1d,  1}; // Look to left +act16 alab4_1d =       {INIT_OBJ_SEQ, 0,                       PROF_1d,  0}; // Walk to right +act16 at78c_1d =       {INIT_OBJ_SEQ, 1 * NORMAL_TPS_v1d + 12, TRAP_1d,  0}; // Close trap +act16 aturnguard_1d =  {INIT_OBJ_SEQ, 2 * NORMAL_TPS_v1d,      GUARD_1d, 0};  act17 acupbdw_1d = {SET_STATE_BITS, 0, CUPBOARD_1d, 2};  act17 acupbpk_1d = {SET_STATE_BITS, 0, CUPBOARD_1d, 1}; -act20 adef1_1d = {DEL_EVENTS, 1 * NORMAL_TPS, ASCHEDULE};     // Stop bats looping +act20 adef1_1d = {DEL_EVENTS, 1 * NORMAL_TPS_v1d, ASCHEDULE};     // Stop bats looping  act21 abut6g_1d =  {GAMEOVER, 7};  act21 adoggy6_1d = {GAMEOVER, 0}; -act23 bye2_1d = {EXIT, 2 * NORMAL_TPS}; +act23 bye2_1d = {EXIT, 2 * NORMAL_TPS_v1d};  act24 abonus0_1d = {BONUS, 0, 0};  act24 abonus1_1d = {BONUS, 0, 1}; @@ -9221,10 +9223,10 @@ act29 achkmask_1d =  {COND_CARRY, 0, MASK_1d, kALputmask_1d, 0};  act29 achkmask2_1d = {COND_CARRY, 0, MASK_1d, kALridmask_1d, 0};  //Strangerke - act26 are stored in new act49, as songs were not handled the same way in DOS version (in harcoded strings) -act49 ahchase4_1d = {OLD_SONG, 4 * NORMAL_TPS, kDTsong3_1d}; -act49 asong1_1d =   {OLD_SONG, 0,              kDTsong1_1d}; -act49 asong2_1d =   {OLD_SONG, 1 * NORMAL_TPS, kDTsong2_1d}; -act49 asong3_1d =   {OLD_SONG, 0,              kDTsong3_1d}; +act49 ahchase4_1d = {OLD_SONG, 4 * NORMAL_TPS_v1d, kDTsong3_1d}; +act49 asong1_1d =   {OLD_SONG, 0,                  kDTsong1_1d}; +act49 asong2_1d =   {OLD_SONG, 1 * NORMAL_TPS_v1d, kDTsong2_1d}; +act49 asong3_1d =   {OLD_SONG, 0,                  kDTsong3_1d};  actListPtr ALbat_1d[]         = {&abatxy_1d, &abatvxy1_1d, &abatvxy2_1d, &abatvxy3_1d, &abatvxy4_1d, &abatvxy5_1d, &arepbat_1d, 0};  actListPtr ALbatattack_1d[]   = {&abata1a_1d, &abata1b_1d, &abata1c_1d, &abata2a_1d, &abata2b_1d, &abata2c_1d, &abata3a_1d, &abata3b_1d, &abata3c_1d, &abata4a_1d, &abata4b_1d, &abata4c_1d, &arepbata_1d, 0}; @@ -9422,14 +9424,14 @@ int dialrsp_2d[] = {kSTSdial2_2d, -1};  int hestrsp_2d[] = {kSTYes_2d,    -1};  int whorsp_2d[]  = {kSTNobody_2d, kSTNo_one1_2d, kSTNo_one2_2d, kSTSharry_2d, -1}; -act0 aclimax_2d   = {ASCHEDULE, 20,               kALclimax_2d}; -act0 aclue09_2d   = {ASCHEDULE, 300 * NORMAL_TPS, kALchkc09_2d}; -act0 ahdrink10_2d = {ASCHEDULE, 52,               kALhfaint_2d}; -act0 aschedbut_2d = {ASCHEDULE, 30,               kALschedbut_2d}; -act0 arepbuga_2d  = {ASCHEDULE, 3 * NORMAL_TPS,   kALbugrep1_2d}; -act0 arepbugf_2d  = {ASCHEDULE, 2 * NORMAL_TPS,   kALbugrep2_2d}; -act0 arepblah_2d  = {ASCHEDULE, 12 * NORMAL_TPS,  kALblah_2d}; -act0 arepmsg1_2d  = {ASCHEDULE, 120 * NORMAL_TPS, kALrepmsg1_2d}; +act0 aclimax_2d   = {ASCHEDULE, 20,                   kALclimax_2d}; +act0 aclue09_2d   = {ASCHEDULE, 300 * NORMAL_TPS_v2d, kALchkc09_2d}; +act0 ahdrink10_2d = {ASCHEDULE, 52,                   kALhfaint_2d}; +act0 aschedbut_2d = {ASCHEDULE, 30,                   kALschedbut_2d}; +act0 arepbuga_2d  = {ASCHEDULE, 3 * NORMAL_TPS_v2d,   kALbugrep1_2d}; +act0 arepbugf_2d  = {ASCHEDULE, 2 * NORMAL_TPS_v2d,   kALbugrep2_2d}; +act0 arepblah_2d  = {ASCHEDULE, 12 * NORMAL_TPS_v2d,  kALblah_2d}; +act0 arepmsg1_2d  = {ASCHEDULE, 120 * NORMAL_TPS_v2d, kALrepmsg1_2d};  act1 aback1_2d       = {START_OBJ, 0,             CAT_2d,       0, ALMOST_INVISIBLE};  act1 aback2_2d       = {START_OBJ, 2,             CAT_2d,       0, NOT_CYCLING}; @@ -9915,189 +9917,189 @@ act11 achkmaid_2d   = {COND_R, 0, MAID_2d,     0,    kALmaidx_2d,    kALblah_2d}  act11 achkstate0_2d = {COND_R, 0, BOOK_2d,     0,    kALhugone_2d,   kALchkstate1_2d};  act11 achkstate1_2d = {COND_R, 0, BOOK_2d,     1,    kALhole_2d,     kALpengone_2d}; -act12 aball4_2d    = {TEXT, 2,                   kSTBalloon1_2d}; -act12 aball5_2d    = {TEXT, 2,                   kSTBalloon2_2d}; -act12 aball6_2d    = {TEXT, 2,                   kSTBalloon3_2d}; -act12 abanana1_2d  = {TEXT, 0,                   kSTBanana1_2d}; -act12 abanana3_2d  = {TEXT, 0,                   kSTBanana2_2d}; -act12 abell_2d     = {TEXT, 0,                   kSTBell1_2d}; -act12 abell1_2d    = {TEXT, 8,                   kSTMaid7_2d}; -act12 abite2_2d    = {TEXT, 0,                   kSTSnake5_2d}; -act12 ablah_2d     = {TEXT, 8,                   kSTBlah_2d}; -act12 aboom_2d     = {TEXT, 0,                   kSTDyn4_2d}; -act12 acallp2_2d   = {TEXT, 0,                   kSTCall1_2d}; -act12 acallp3_2d   = {TEXT, 0,                   kSTCall2_2d}; -act12 acallp4_2d   = {TEXT, 0,                   kSTCall3_2d}; -act12 acallp5_2d   = {TEXT, 0,                   kSTCall4_2d}; -act12 acallp6_2d   = {TEXT, 0,                   kSTCall5_2d}; -act12 acallp7_2d   = {TEXT, 0,                   kSTCall6_2d}; -act12 acantpush_2d = {TEXT, 0,                   kSTPush1_2d}; -act12 acat1_2d     = {TEXT, 0,                   kSTCat3_2d}; -act12 acat4_2d     = {TEXT, 0,                   kSTMaid8_2d}; -act12 achasm1_2d   = {TEXT, 12,                  kSTChasm1_2d}; -act12 acheat1_2d   = {TEXT, 0,                   kSTScheat1_2d}; -act12 acheat2_2d   = {TEXT, 0,                   kSTScheat2_2d}; -act12 aclimax1_2d  = {TEXT, 0,                   kSTSclimax1_2d}; -act12 aclimax2_2d  = {TEXT, 8,                   kSTSclimax2_2d}; -act12 aclimax3_2d  = {TEXT, 80,                  kSTSclimax3_2d}; -act12 aclimax4_2d  = {TEXT, 80,                  kSTSclimax4_2d}; -act12 aclimax5_2d  = {TEXT, 80,                  kSTSclimax5_2d}; -act12 aclimax6_2d  = {TEXT, 80,                  kSTSclimax6_2d}; -act12 aclue09a_2d  = {TEXT, 0,                   kSTSclue09a_2d}; -act12 aclue09b_2d  = {TEXT, 0,                   kSTSclue09b_2d}; -act12 aclue09c_2d  = {TEXT, 0,                   kSTSclue09c_2d}; -act12 acomb1_2d    = {TEXT, 0,                   kSTScomb1_2d}; -act12 acomb2_2d    = {TEXT, 0,                   kSTScomb2_2d}; -act12 acook1_2d    = {TEXT, 8,                   kSTCook1_2d}; -act12 acook2_2d    = {TEXT, 8,                   kSTCook2_2d}; -act12 acook3_2d    = {TEXT, 8,                   kSTCook3_2d}; -act12 acook4_2d    = {TEXT, 24,                  kSTCook4_2d}; -act12 acook5_2d    = {TEXT, 24,                  kSTCook5_2d}; -act12 adalek1_2d   = {TEXT, 0,                   kSTFire3_2d}; -act12 adidnt1_2d   = {TEXT, 0,                   kSTSdidnt1_2d}; -act12 adidnt2_2d   = {TEXT, 0,                   kSTSdidnt2_2d}; -act12 adog1_2d     = {TEXT, 0,                   kSTDyn2_2d}; -act12 adone1_2d    = {TEXT, 10,                  kSTSdone1_2d}; -act12 adone13_2d   = {TEXT, 50,                  kSTSdone5_2d}; -act12 adone14_2d   = {TEXT, 50,                  kSTSdone6_2d}; -act12 adone2_2d    = {TEXT, 10,                  kSTSdone2_2d}; -act12 adone3_2d    = {TEXT, 10,                  kSTSdone3_2d}; -act12 adone4_2d    = {TEXT, 10,                  kSTSdone4_2d}; -act12 adraught_2d  = {TEXT, 5 * 60 * NORMAL_TPS, kSTDraught_2d}; -act12 adropdyn2_2d = {TEXT, 0,                   kSTDyn3_2d}; -act12 adumb12_2d   = {TEXT, 0,                   kSTDumb2_2d}; -act12 adumb2_2d    = {TEXT, 0,                   kSTDumb1_2d}; -act12 adyn1_2d     = {TEXT, 0,                   kSTDyn1_2d}; -act12 aeatban_2d   = {TEXT, 0,                   kSTSeatbanana_2d}; -act12 aeatgarl1_2d = {TEXT, 0,                   kSTSgarl1_2d}; -act12 aeatgarl2_2d = {TEXT, 0,                   kSTSgarl2_2d}; -act12 aexplainb_2d = {TEXT, 0,                   kSTSexplainb_2d}; -act12 aext1_2d     = {TEXT, 0,                   kSTSdalek1_2d}; -act12 aext2_2d     = {TEXT, 0,                   kSTSdalek2_2d}; -act12 aext3_2d     = {TEXT, 0,                   kSTSdalek3_2d}; -act12 agard10_2d   = {TEXT, 300,                 kSTSgard6_2d}; -act12 agard5_2d    = {TEXT, 20,                  kSTSgard1_2d}; -act12 agard6_2d    = {TEXT, 30,                  kSTSgard2_2d}; -act12 agard7_2d    = {TEXT, 40,                  kSTSgard3_2d}; -act12 agard8_2d    = {TEXT, 90,                  kSTSgard4_2d}; -act12 agard9_2d    = {TEXT, 100,                 kSTSgard5_2d}; -act12 agenie1_2d   = {TEXT, 0,                   kSTRub2_2d}; -act12 agiveb3_2d   = {TEXT, 0,                   kSTCat2_2d}; -act12 ahdrink11_2d = {TEXT, 62,                  kSTHest4_2d}; -act12 ahdrink12_2d = {TEXT, 64,                  kSTSay1_2d}; -act12 ahdrink13_2d = {TEXT, 64,                  kSTSay2_2d}; -act12 ahdrink2_2d  = {TEXT, 0,                   kSTHest1_2d}; -act12 ahdrink8_2d  = {TEXT, 52,                  kSTHest2_2d}; -act12 ahdrink9_2d  = {TEXT, 52,                  kSTHest3_2d}; -act12 ahest12_2d   = {TEXT, 8,                   kSTHest6_2d}; -act12 ahest13_2d   = {TEXT, 12,                  kSTHest7_2d}; -act12 ahest14_2d   = {TEXT, 16,                  kSTHest8_2d}; -act12 ahest15_2d   = {TEXT, 50,                  kSTHest9_2d}; -act12 ahestd2_2d   = {TEXT, 0,                   kSTHest5_2d}; -act12 ahnod1_2d    = {TEXT, 0,                   kSTNod1_2d}; -act12 ahnod2_2d    = {TEXT, 0,                   kSTSay1_2d}; -act12 ahnod3_2d    = {TEXT, 0,                   kSTSay2_2d}; -act12 akaboom1_2d  = {TEXT, 0,                   kSTDyn5_2d}; -act12 alookm1_2d   = {TEXT, 0,                   kSTMatch1_2d}; -act12 alookm2_2d   = {TEXT, 0,                   kSTMatch2_2d}; -act12 amat5_2d     = {TEXT, 0,                   kSTMatch4_2d}; -act12 amissed2_2d  = {TEXT, 0,                   kSTFire1_2d}; -act12 amissed3_2d  = {TEXT, 0,                   kSTFire2_2d}; -act12 amurd4_2d    = {TEXT, 10,                  kSTArgue1_2d}; -act12 anobang_2d   = {TEXT, 0,                   kSTDyn7_2d}; -act12 anobang2_2d  = {TEXT, 0,                   kSTDyn6_2d}; -act12 anobell_2d   = {TEXT, 8,                   kSTBell2_2d}; -act12 anogenie_2d  = {TEXT, 0,                   kSTRub1_2d}; -act12 anoreply_2d  = {TEXT, 0,                   kSTBrrr_2d}; -act12 anotrap_2d   = {TEXT, 0,                   kSTTrap1_2d}; -act12 aom1_2d      = {TEXT, 8,                   kSTSom1_2d}; -act12 aom10_2d     = {TEXT, 50,                  kSTSom4_2d}; -act12 aom11_2d     = {TEXT, 50,                  kSTSom5_2d}; -act12 aom12_2d     = {TEXT, 50,                  kSTSom6_2d}; -act12 aom13_2d     = {TEXT, 54,                  kSTSom7_2d}; -act12 aom14_2d     = {TEXT, 54,                  kSTSom8_2d}; -act12 aom5_2d      = {TEXT, 16,                  kSTSom2_2d}; -act12 aom6_2d      = {TEXT, 20,                  kSTSom3_2d}; -act12 aom9_2d      = {TEXT, 40,                  kSTSom3a_2d}; -act12 apen1_2d     = {TEXT, 0,                   kSTSpen1_2d}; -act12 apen2_2d     = {TEXT, 0,                   kSTSpen2_2d}; -act12 apen3_2d     = {TEXT, 0,                   kSTSpen3_2d}; -act12 aphoto4_2d   = {TEXT, 0,                   kSTSphoto_2d}; -act12 aphoto6_2d   = {TEXT, 0,                   kSTSphoto1_2d}; -act12 apois1_2d    = {TEXT, 0,                   kSTSnake1_2d}; -act12 apois2_2d    = {TEXT, 0,                   kSTSnake2_2d}; -act12 apois3_2d    = {TEXT, 0,                   kSTSnake3_2d}; -act12 apois4_2d    = {TEXT, 0,                   kSTSnake4_2d}; -act12 aridkey2_2d  = {TEXT, 0,                   kSTSridkey_2d}; -act12 arok_2d      = {TEXT, 0,                   kSTWell1_2d}; -act12 arumbling_2d = {TEXT, 0,                   kSTRumble_2d}; -act12 arup_2d      = {TEXT, 0,                   kSTDyn8_2d}; -act12 asafe1_2d    = {TEXT, 0,                   kSTSsafe1_2d}; -act12 ascr31_2d    = {TEXT, 0,                   kSTLock1_2d}; -act12 aserum1_2d   = {TEXT, 0,                   kSTSserum1_2d}; -act12 aserum2_2d   = {TEXT, 0,                   kSTSserum2_2d}; -act12 asilly_2d    = {TEXT, 0,                   kSTDyn9_2d}; -act12 asniff_2d    = {TEXT, 0,                   kSTCat1_2d}; -act12 asonic1_2d   = {TEXT, 0,                   kSTSsonic1_2d}; -act12 asonic2_2d   = {TEXT, 0,                   kSTSsonic2_2d}; -act12 asonic3_2d   = {TEXT, 0,                   kSTSsonic3_2d}; -act12 asonic4_2d   = {TEXT, 0,                   kSTSsonic4_2d}; -act12 astick1_2d   = {TEXT, 0,                   kSTWeee_2d}; -act12 astrike1_2d  = {TEXT, 0,                   kSTMatch3_2d}; -act12 astung_2d    = {TEXT, 0,                   kSTStung_2d}; -act12 awarn_2d     = {TEXT, 8,                   kSTSwarn_2d}; -act12 awarnz_2d    = {TEXT, 8,                   kSTSwarnz_2d}; -act12 awho1_2d     = {TEXT, 0,                   kSTTard1_2d}; -act12 awho2_2d     = {TEXT, 0,                   kSTTard2_2d}; -act12 awill1_2d    = {TEXT, 0,                   kSTSwill1_2d}; -act12 awill2_2d    = {TEXT, 0,                   kSTSwill2_2d}; -act12 awill3_2d    = {TEXT, 0,                   kSTSwill3_2d}; -act12 awill4_2d    = {TEXT, 0,                   kSTSwill4_2d}; -act12 abell2_2d    = {TEXT, 16,                  kSTMaid6_2d}; -act12 abug5a_2d    = {TEXT, 0,                   kSTStingeroo_2d}; -act12 abug5b_2d    = {TEXT, 0,                   kSTSbug5b_2d}; -act12 aclick_2d    = {TEXT, 0,                   kSTClick_2d}; -act12 aempty_2d    = {TEXT, 0,                   kSTEmpty_2d}; -act12 afaint1_2d   = {TEXT, 5,                   kSTSfaint1_2d}; -act12 afaint10_2d  = {TEXT, 35,                  kSTSfaint4_2d}; -act12 afaint5_2d   = {TEXT, 20,                  kSTSfaint2_2d}; -act12 afaint9_2d   = {TEXT, 35,                  kSTSfaint3_2d}; -act12 agone10_2d   = {TEXT, 115,                 kSTSgone6_2d}; -act12 agone11_2d   = {TEXT, 115,                 kSTSgone7_2d}; -act12 agone5_2d    = {TEXT, 0,                   kSTSgone1_2d}; -act12 agone6_2d    = {TEXT, 34,                  kSTSgone2_2d}; -act12 agone7_2d    = {TEXT, 70,                  kSTSgone3_2d}; -act12 agone8_2d    = {TEXT, 90,                  kSTSgone4_2d}; -act12 agone9_2d    = {TEXT, 115,                 kSTSgone5_2d}; -act12 aharry3_2d   = {TEXT, 4,                   kSTOrgan1_2d}; -act12 aharry4_2d   = {TEXT, 4,                   kSTOrgan2_2d}; -act12 aharry5_2d   = {TEXT, 4,                   kSTOrgan3_2d}; -act12 aharry7_2d   = {TEXT, 8,                   kSTOrgan4_2d}; -act12 ahole_2d     = {TEXT, 0,                   kSTFirst2_2d}; -act12 akeyhole1_2d = {TEXT, 0,                   kSTHole1_2d}; -act12 alie1_2d     = {TEXT, 13,                  kSTTired_2d}; -act12 alie2_2d     = {TEXT, 18,                  kSTTired2_2d}; -act12 amaid10_2d   = {TEXT, 90 * NORMAL_TPS,     kSTSmaid1_8_2d}; -act12 amaid11_2d   = {TEXT, 99 * NORMAL_TPS,     kSTSmaid1_9_2d}; -act12 amaid12_2d   = {TEXT, 0,                   kSTSmaid1_10_2d}; -act12 amaid3_2d    = {TEXT, 4,                   kSTSmaid1_1_2d}; -act12 amaid4_2d    = {TEXT, 17,                  kSTSmaid1_2_2d}; -act12 amaid5_2d    = {TEXT, 17,                  kSTSmaid1_3_2d}; -act12 amaid6_2d    = {TEXT, 17,                  kSTSmaid1_4_2d}; -act12 amaid7_2d    = {TEXT, 30,                  kSTSmaid1_5_2d}; -act12 amaid8_2d    = {TEXT, 30 * NORMAL_TPS,     kSTSmaid1_6_2d}; -act12 amaid9_2d    = {TEXT, 60 * NORMAL_TPS,     kSTSmaid1_7_2d}; -act12 amaidp3_2d   = {TEXT, 8,                   kSTMaid1_2d}; -act12 amaidp4_2d   = {TEXT, 8,                   kSTMaid2_2d}; -act12 amaidp5_2d   = {TEXT, 8,                   kSTMaid3_2d}; -act12 amaidp7_2d   = {TEXT, 12,                  kSTMaid4_2d}; -act12 amaidp8_2d   = {TEXT, 12,                  kSTMaid5_2d}; -act12 anocarry_2d  = {TEXT, 0,                   kSTNocarry_2d}; -act12 anopurps_2d  = {TEXT, 0,                   kSTNopurps_2d}; -act12 aok_2d       = {TEXT, 0,                   kSTOkgen_2d}; -act12 ascr21_2d    = {TEXT, 0,                   kSTSfirst_2d}; -act12 astory1_2d   = {TEXT, STORYDELAY,          kSTStory_2d}; -act12 astory2_2d   = {TEXT, STORYDELAY,          kSTStory1_2d}; +act12 aball4_2d    = {TEXT, 2,                       kSTBalloon1_2d}; +act12 aball5_2d    = {TEXT, 2,                       kSTBalloon2_2d}; +act12 aball6_2d    = {TEXT, 2,                       kSTBalloon3_2d}; +act12 abanana1_2d  = {TEXT, 0,                       kSTBanana1_2d}; +act12 abanana3_2d  = {TEXT, 0,                       kSTBanana2_2d}; +act12 abell_2d     = {TEXT, 0,                       kSTBell1_2d}; +act12 abell1_2d    = {TEXT, 8,                       kSTMaid7_2d}; +act12 abite2_2d    = {TEXT, 0,                       kSTSnake5_2d}; +act12 ablah_2d     = {TEXT, 8,                       kSTBlah_2d}; +act12 aboom_2d     = {TEXT, 0,                       kSTDyn4_2d}; +act12 acallp2_2d   = {TEXT, 0,                       kSTCall1_2d}; +act12 acallp3_2d   = {TEXT, 0,                       kSTCall2_2d}; +act12 acallp4_2d   = {TEXT, 0,                       kSTCall3_2d}; +act12 acallp5_2d   = {TEXT, 0,                       kSTCall4_2d}; +act12 acallp6_2d   = {TEXT, 0,                       kSTCall5_2d}; +act12 acallp7_2d   = {TEXT, 0,                       kSTCall6_2d}; +act12 acantpush_2d = {TEXT, 0,                       kSTPush1_2d}; +act12 acat1_2d     = {TEXT, 0,                       kSTCat3_2d}; +act12 acat4_2d     = {TEXT, 0,                       kSTMaid8_2d}; +act12 achasm1_2d   = {TEXT, 12,                      kSTChasm1_2d}; +act12 acheat1_2d   = {TEXT, 0,                       kSTScheat1_2d}; +act12 acheat2_2d   = {TEXT, 0,                       kSTScheat2_2d}; +act12 aclimax1_2d  = {TEXT, 0,                       kSTSclimax1_2d}; +act12 aclimax2_2d  = {TEXT, 8,                       kSTSclimax2_2d}; +act12 aclimax3_2d  = {TEXT, 80,                      kSTSclimax3_2d}; +act12 aclimax4_2d  = {TEXT, 80,                      kSTSclimax4_2d}; +act12 aclimax5_2d  = {TEXT, 80,                      kSTSclimax5_2d}; +act12 aclimax6_2d  = {TEXT, 80,                      kSTSclimax6_2d}; +act12 aclue09a_2d  = {TEXT, 0,                       kSTSclue09a_2d}; +act12 aclue09b_2d  = {TEXT, 0,                       kSTSclue09b_2d}; +act12 aclue09c_2d  = {TEXT, 0,                       kSTSclue09c_2d}; +act12 acomb1_2d    = {TEXT, 0,                       kSTScomb1_2d}; +act12 acomb2_2d    = {TEXT, 0,                       kSTScomb2_2d}; +act12 acook1_2d    = {TEXT, 8,                       kSTCook1_2d}; +act12 acook2_2d    = {TEXT, 8,                       kSTCook2_2d}; +act12 acook3_2d    = {TEXT, 8,                       kSTCook3_2d}; +act12 acook4_2d    = {TEXT, 24,                      kSTCook4_2d}; +act12 acook5_2d    = {TEXT, 24,                      kSTCook5_2d}; +act12 adalek1_2d   = {TEXT, 0,                       kSTFire3_2d}; +act12 adidnt1_2d   = {TEXT, 0,                       kSTSdidnt1_2d}; +act12 adidnt2_2d   = {TEXT, 0,                       kSTSdidnt2_2d}; +act12 adog1_2d     = {TEXT, 0,                       kSTDyn2_2d}; +act12 adone1_2d    = {TEXT, 10,                      kSTSdone1_2d}; +act12 adone13_2d   = {TEXT, 50,                      kSTSdone5_2d}; +act12 adone14_2d   = {TEXT, 50,                      kSTSdone6_2d}; +act12 adone2_2d    = {TEXT, 10,                      kSTSdone2_2d}; +act12 adone3_2d    = {TEXT, 10,                      kSTSdone3_2d}; +act12 adone4_2d    = {TEXT, 10,                      kSTSdone4_2d}; +act12 adraught_2d  = {TEXT, 5 * 60 * NORMAL_TPS_v2d, kSTDraught_2d}; +act12 adropdyn2_2d = {TEXT, 0,                       kSTDyn3_2d}; +act12 adumb12_2d   = {TEXT, 0,                       kSTDumb2_2d}; +act12 adumb2_2d    = {TEXT, 0,                       kSTDumb1_2d}; +act12 adyn1_2d     = {TEXT, 0,                       kSTDyn1_2d}; +act12 aeatban_2d   = {TEXT, 0,                       kSTSeatbanana_2d}; +act12 aeatgarl1_2d = {TEXT, 0,                       kSTSgarl1_2d}; +act12 aeatgarl2_2d = {TEXT, 0,                       kSTSgarl2_2d}; +act12 aexplainb_2d = {TEXT, 0,                       kSTSexplainb_2d}; +act12 aext1_2d     = {TEXT, 0,                       kSTSdalek1_2d}; +act12 aext2_2d     = {TEXT, 0,                       kSTSdalek2_2d}; +act12 aext3_2d     = {TEXT, 0,                       kSTSdalek3_2d}; +act12 agard10_2d   = {TEXT, 300,                     kSTSgard6_2d}; +act12 agard5_2d    = {TEXT, 20,                      kSTSgard1_2d}; +act12 agard6_2d    = {TEXT, 30,                      kSTSgard2_2d}; +act12 agard7_2d    = {TEXT, 40,                      kSTSgard3_2d}; +act12 agard8_2d    = {TEXT, 90,                      kSTSgard4_2d}; +act12 agard9_2d    = {TEXT, 100,                     kSTSgard5_2d}; +act12 agenie1_2d   = {TEXT, 0,                       kSTRub2_2d}; +act12 agiveb3_2d   = {TEXT, 0,                       kSTCat2_2d}; +act12 ahdrink11_2d = {TEXT, 62,                      kSTHest4_2d}; +act12 ahdrink12_2d = {TEXT, 64,                      kSTSay1_2d}; +act12 ahdrink13_2d = {TEXT, 64,                      kSTSay2_2d}; +act12 ahdrink2_2d  = {TEXT, 0,                       kSTHest1_2d}; +act12 ahdrink8_2d  = {TEXT, 52,                      kSTHest2_2d}; +act12 ahdrink9_2d  = {TEXT, 52,                      kSTHest3_2d}; +act12 ahest12_2d   = {TEXT, 8,                       kSTHest6_2d}; +act12 ahest13_2d   = {TEXT, 12,                      kSTHest7_2d}; +act12 ahest14_2d   = {TEXT, 16,                      kSTHest8_2d}; +act12 ahest15_2d   = {TEXT, 50,                      kSTHest9_2d}; +act12 ahestd2_2d   = {TEXT, 0,                       kSTHest5_2d}; +act12 ahnod1_2d    = {TEXT, 0,                       kSTNod1_2d}; +act12 ahnod2_2d    = {TEXT, 0,                       kSTSay1_2d}; +act12 ahnod3_2d    = {TEXT, 0,                       kSTSay2_2d}; +act12 akaboom1_2d  = {TEXT, 0,                       kSTDyn5_2d}; +act12 alookm1_2d   = {TEXT, 0,                       kSTMatch1_2d}; +act12 alookm2_2d   = {TEXT, 0,                       kSTMatch2_2d}; +act12 amat5_2d     = {TEXT, 0,                       kSTMatch4_2d}; +act12 amissed2_2d  = {TEXT, 0,                       kSTFire1_2d}; +act12 amissed3_2d  = {TEXT, 0,                       kSTFire2_2d}; +act12 amurd4_2d    = {TEXT, 10,                      kSTArgue1_2d}; +act12 anobang_2d   = {TEXT, 0,                       kSTDyn7_2d}; +act12 anobang2_2d  = {TEXT, 0,                       kSTDyn6_2d}; +act12 anobell_2d   = {TEXT, 8,                       kSTBell2_2d}; +act12 anogenie_2d  = {TEXT, 0,                       kSTRub1_2d}; +act12 anoreply_2d  = {TEXT, 0,                       kSTBrrr_2d}; +act12 anotrap_2d   = {TEXT, 0,                       kSTTrap1_2d}; +act12 aom1_2d      = {TEXT, 8,                       kSTSom1_2d}; +act12 aom10_2d     = {TEXT, 50,                      kSTSom4_2d}; +act12 aom11_2d     = {TEXT, 50,                      kSTSom5_2d}; +act12 aom12_2d     = {TEXT, 50,                      kSTSom6_2d}; +act12 aom13_2d     = {TEXT, 54,                      kSTSom7_2d}; +act12 aom14_2d     = {TEXT, 54,                      kSTSom8_2d}; +act12 aom5_2d      = {TEXT, 16,                      kSTSom2_2d}; +act12 aom6_2d      = {TEXT, 20,                      kSTSom3_2d}; +act12 aom9_2d      = {TEXT, 40,                      kSTSom3a_2d}; +act12 apen1_2d     = {TEXT, 0,                       kSTSpen1_2d}; +act12 apen2_2d     = {TEXT, 0,                       kSTSpen2_2d}; +act12 apen3_2d     = {TEXT, 0,                       kSTSpen3_2d}; +act12 aphoto4_2d   = {TEXT, 0,                       kSTSphoto_2d}; +act12 aphoto6_2d   = {TEXT, 0,                       kSTSphoto1_2d}; +act12 apois1_2d    = {TEXT, 0,                       kSTSnake1_2d}; +act12 apois2_2d    = {TEXT, 0,                       kSTSnake2_2d}; +act12 apois3_2d    = {TEXT, 0,                       kSTSnake3_2d}; +act12 apois4_2d    = {TEXT, 0,                       kSTSnake4_2d}; +act12 aridkey2_2d  = {TEXT, 0,                       kSTSridkey_2d}; +act12 arok_2d      = {TEXT, 0,                       kSTWell1_2d}; +act12 arumbling_2d = {TEXT, 0,                       kSTRumble_2d}; +act12 arup_2d      = {TEXT, 0,                       kSTDyn8_2d}; +act12 asafe1_2d    = {TEXT, 0,                       kSTSsafe1_2d}; +act12 ascr31_2d    = {TEXT, 0,                       kSTLock1_2d}; +act12 aserum1_2d   = {TEXT, 0,                       kSTSserum1_2d}; +act12 aserum2_2d   = {TEXT, 0,                       kSTSserum2_2d}; +act12 asilly_2d    = {TEXT, 0,                       kSTDyn9_2d}; +act12 asniff_2d    = {TEXT, 0,                       kSTCat1_2d}; +act12 asonic1_2d   = {TEXT, 0,                       kSTSsonic1_2d}; +act12 asonic2_2d   = {TEXT, 0,                       kSTSsonic2_2d}; +act12 asonic3_2d   = {TEXT, 0,                       kSTSsonic3_2d}; +act12 asonic4_2d   = {TEXT, 0,                       kSTSsonic4_2d}; +act12 astick1_2d   = {TEXT, 0,                       kSTWeee_2d}; +act12 astrike1_2d  = {TEXT, 0,                       kSTMatch3_2d}; +act12 astung_2d    = {TEXT, 0,                       kSTStung_2d}; +act12 awarn_2d     = {TEXT, 8,                       kSTSwarn_2d}; +act12 awarnz_2d    = {TEXT, 8,                       kSTSwarnz_2d}; +act12 awho1_2d     = {TEXT, 0,                       kSTTard1_2d}; +act12 awho2_2d     = {TEXT, 0,                       kSTTard2_2d}; +act12 awill1_2d    = {TEXT, 0,                       kSTSwill1_2d}; +act12 awill2_2d    = {TEXT, 0,                       kSTSwill2_2d}; +act12 awill3_2d    = {TEXT, 0,                       kSTSwill3_2d}; +act12 awill4_2d    = {TEXT, 0,                       kSTSwill4_2d}; +act12 abell2_2d    = {TEXT, 16,                      kSTMaid6_2d}; +act12 abug5a_2d    = {TEXT, 0,                       kSTStingeroo_2d}; +act12 abug5b_2d    = {TEXT, 0,                       kSTSbug5b_2d}; +act12 aclick_2d    = {TEXT, 0,                       kSTClick_2d}; +act12 aempty_2d    = {TEXT, 0,                       kSTEmpty_2d}; +act12 afaint1_2d   = {TEXT, 5,                       kSTSfaint1_2d}; +act12 afaint10_2d  = {TEXT, 35,                      kSTSfaint4_2d}; +act12 afaint5_2d   = {TEXT, 20,                      kSTSfaint2_2d}; +act12 afaint9_2d   = {TEXT, 35,                      kSTSfaint3_2d}; +act12 agone10_2d   = {TEXT, 115,                     kSTSgone6_2d}; +act12 agone11_2d   = {TEXT, 115,                     kSTSgone7_2d}; +act12 agone5_2d    = {TEXT, 0,                       kSTSgone1_2d}; +act12 agone6_2d    = {TEXT, 34,                      kSTSgone2_2d}; +act12 agone7_2d    = {TEXT, 70,                      kSTSgone3_2d}; +act12 agone8_2d    = {TEXT, 90,                      kSTSgone4_2d}; +act12 agone9_2d    = {TEXT, 115,                     kSTSgone5_2d}; +act12 aharry3_2d   = {TEXT, 4,                       kSTOrgan1_2d}; +act12 aharry4_2d   = {TEXT, 4,                       kSTOrgan2_2d}; +act12 aharry5_2d   = {TEXT, 4,                       kSTOrgan3_2d}; +act12 aharry7_2d   = {TEXT, 8,                       kSTOrgan4_2d}; +act12 ahole_2d     = {TEXT, 0,                       kSTFirst2_2d}; +act12 akeyhole1_2d = {TEXT, 0,                       kSTHole1_2d}; +act12 alie1_2d     = {TEXT, 13,                      kSTTired_2d}; +act12 alie2_2d     = {TEXT, 18,                      kSTTired2_2d}; +act12 amaid10_2d   = {TEXT, 90 * NORMAL_TPS_v2d,     kSTSmaid1_8_2d}; +act12 amaid11_2d   = {TEXT, 99 * NORMAL_TPS_v2d,     kSTSmaid1_9_2d}; +act12 amaid12_2d   = {TEXT, 0,                       kSTSmaid1_10_2d}; +act12 amaid3_2d    = {TEXT, 4,                       kSTSmaid1_1_2d}; +act12 amaid4_2d    = {TEXT, 17,                      kSTSmaid1_2_2d}; +act12 amaid5_2d    = {TEXT, 17,                      kSTSmaid1_3_2d}; +act12 amaid6_2d    = {TEXT, 17,                      kSTSmaid1_4_2d}; +act12 amaid7_2d    = {TEXT, 30,                      kSTSmaid1_5_2d}; +act12 amaid8_2d    = {TEXT, 30 * NORMAL_TPS_v2d,     kSTSmaid1_6_2d}; +act12 amaid9_2d    = {TEXT, 60 * NORMAL_TPS_v2d,     kSTSmaid1_7_2d}; +act12 amaidp3_2d   = {TEXT, 8,                       kSTMaid1_2d}; +act12 amaidp4_2d   = {TEXT, 8,                       kSTMaid2_2d}; +act12 amaidp5_2d   = {TEXT, 8,                       kSTMaid3_2d}; +act12 amaidp7_2d   = {TEXT, 12,                      kSTMaid4_2d}; +act12 amaidp8_2d   = {TEXT, 12,                      kSTMaid5_2d}; +act12 anocarry_2d  = {TEXT, 0,                       kSTNocarry_2d}; +act12 anopurps_2d  = {TEXT, 0,                       kSTNopurps_2d}; +act12 aok_2d       = {TEXT, 0,                       kSTOkgen_2d}; +act12 ascr21_2d    = {TEXT, 0,                       kSTSfirst_2d}; +act12 astory1_2d   = {TEXT, STORYDELAY,              kSTStory_2d}; +act12 astory2_2d   = {TEXT, STORYDELAY,              kSTStory1_2d};  act13 ascr33b_2d   = {SWAP_IMAGES, 4,  HERO, PENNY_2d};  act13 aswaphero_2d = {SWAP_IMAGES, 23, HERO, PENNY_2d}; @@ -10292,14 +10294,14 @@ act33 amaidc11_2d = {INIT_SCREEN, 30, MAID_2d,      31};  act33 amaidc2_2d  = {INIT_SCREEN, 8,  MAID_2d,      32};  act33 amaidp1_2d  = {INIT_SCREEN, 0,  MAID_2d,      31}; -act34 abang1_2d   = {AGSCHEDULE, 5 * NORMAL_TPS,   kALbang2_2d}; -act34 abite3_2d   = {AGSCHEDULE, 60 * NORMAL_TPS,  kALpois1_2d}; -act34 abite4_2d   = {AGSCHEDULE, 200 * NORMAL_TPS, kALpois2_2d}; -act34 abite5_2d   = {AGSCHEDULE, 290 * NORMAL_TPS, kALpois3_2d}; -act34 abite6_2d   = {AGSCHEDULE, 300 * NORMAL_TPS, kALpois4_2d}; -act34 acat3_2d    = {AGSCHEDULE, 8 * NORMAL_TPS,   kALchkcarry_2d}; -act34 akaboom2_2d = {AGSCHEDULE, 1,                kALkaboom3_2d}; -act34 amaidb6_2d  = {AGSCHEDULE, 8 * NORMAL_TPS,   kALmaidbk_2d}; +act34 abang1_2d   = {AGSCHEDULE, 5 * NORMAL_TPS_v2d,   kALbang2_2d}; +act34 abite3_2d   = {AGSCHEDULE, 60 * NORMAL_TPS_v2d,  kALpois1_2d}; +act34 abite4_2d   = {AGSCHEDULE, 200 * NORMAL_TPS_v2d, kALpois2_2d}; +act34 abite5_2d   = {AGSCHEDULE, 290 * NORMAL_TPS_v2d, kALpois3_2d}; +act34 abite6_2d   = {AGSCHEDULE, 300 * NORMAL_TPS_v2d, kALpois4_2d}; +act34 acat3_2d    = {AGSCHEDULE, 8 * NORMAL_TPS_v2d,   kALchkcarry_2d}; +act34 akaboom2_2d = {AGSCHEDULE, 1,                    kALkaboom3_2d}; +act34 amaidb6_2d  = {AGSCHEDULE, 8 * NORMAL_TPS_v2d,   kALmaidbk_2d};  act35 amap0_2d = {REMAPPAL, 0, _TLIGHTMAGENTA, _LIGHTMAGENTA};  act35 amap1_2d = {REMAPPAL, 0, _TLIGHTMAGENTA, _BLACK}; @@ -10919,47 +10921,47 @@ act8 ascr_wfall_clf_3d =      {NEW_SCREEN, 0,   CLIFF_3d};  act8 ascr_wfallb_wbase_3d =   {NEW_SCREEN, 0,   WBASE_3d};  act8 aweb23_3d =              {NEW_SCREEN, 117, CRASH_3d}; -act9 abrg_msg2_3d =    {INIT_OBJSTATE, 0,              VINE_3d,     1}; -act9 acamp0a_3d =      {INIT_OBJSTATE, 4,              NAT2_3d,     0}; -act9 acom0b_3d =       {INIT_OBJSTATE, 0,              NAT1_3d,     1}; -act9 acom1b_3d =       {INIT_OBJSTATE, 0,              NAT1_3d,     2}; -act9 acom2b_3d =       {INIT_OBJSTATE, 0,              NAT1_3d,     3}; -act9 acom3b_3d =       {INIT_OBJSTATE, 0,              NAT1_3d,     4}; -act9 acom4b_3d =       {INIT_OBJSTATE, 0,              NAT1_3d,     5}; -act9 acom5b_3d =       {INIT_OBJSTATE, 0,              NAT1_3d,     6}; -act9 acom6b_3d =       {INIT_OBJSTATE, 0,              NAT1_3d,     7}; -act9 acom7b_3d =       {INIT_OBJSTATE, 0,              NAT1_3d,     8}; -act9 acom8b_3d =       {INIT_OBJSTATE, 0,              NAT1_3d,     9}; -act9 adart1_3d =       {INIT_OBJSTATE, 0,              BLOWPIPE_3d, 1}; -act9 adn2_3d =         {INIT_OBJSTATE, 0,              HERO,        0}; -act9 adrink_3d =       {INIT_OBJSTATE, 0,              FLASK_3d,    0}; -act9 adropcheese3_3d = {INIT_OBJSTATE, 0,              CHEESE_3d,   1}; -act9 aelewoken_3d =    {INIT_OBJSTATE, 0,              ELEPHANT_3d, 0}; -act9 aemptyflask_3d =  {INIT_OBJSTATE, 0,              FLASK_3d,    0}; -act9 aendaction_3d =   {INIT_OBJSTATE, DARTTIME + 30,  E_EYES_3d,   0}; -act9 aenter1_3d =      {INIT_OBJSTATE, 0,              MOUSE_3d,    2}; -act9 aex7_3d =         {INIT_OBJSTATE, 0,              GHOST_3d,    1}; -act9 afillmagic3_3d =  {INIT_OBJSTATE, 0,              FLASK_3d,    2}; -act9 afillord2_3d =    {INIT_OBJSTATE, 0,              FLASK_3d,    1}; -act9 afindb1_3d =      {INIT_OBJSTATE, 0,              BOOK_3d,     1}; -act9 agive3_3d =       {INIT_OBJSTATE, 0,              NAT1_3d,     10}; -act9 agot1_3d =        {INIT_OBJSTATE, 0,              DOCTOR_3d,   1}; -act9 ahelp2_3d =       {INIT_OBJSTATE, 0,              HERO,        1}; -act9 ahole5a_3d =      {INIT_OBJSTATE, 0,              MOUSE_3d,    1}; -act9 ahole5b_3d =      {INIT_OBJSTATE, 0,              MOUSE_3d,    0}; -act9 amakeclay2_3d =   {INIT_OBJSTATE, 0,              CLAY_3d,     1}; -act9 amission1_3d =    {INIT_OBJSTATE, 0,              PENNY_3d,    2}; -act9 amousefree_3d =   {INIT_OBJSTATE, 0,              MOUSE_3d,    3}; -act9 aoldstate_3d =    {INIT_OBJSTATE, 0,              MOUTH_3d,    1}; -act9 aopen2_3d =       {INIT_OBJSTATE, 0,              CDOOR_3d,    1}; -act9 apause0_3d =      {INIT_OBJSTATE, 3 * NORMAL_TPS, NAT2_3d,     0}; -act9 apause1_3d =      {INIT_OBJSTATE, 0,              NAT2_3d,     1}; -act9 astartaction_3d = {INIT_OBJSTATE, 0,              E_EYES_3d,   1}; -act9 astick3_3d =      {INIT_OBJSTATE, 0,              DOCTOR_3d,   2}; -act9 atakecheese1_3d = {INIT_OBJSTATE, 0,              CHEESE_3d,   0}; -act9 aup2_3d =         {INIT_OBJSTATE, 0,              HERO,        1}; -act9 avine6_3d =       {INIT_OBJSTATE, 0,              BLOCK1_3d,   1}; -act9 aweb1_3d =        {INIT_OBJSTATE, 0,              PENNY_3d,    1}; +act9 abrg_msg2_3d =    {INIT_OBJSTATE, 0,                  VINE_3d,     1}; +act9 acamp0a_3d =      {INIT_OBJSTATE, 4,                  NAT2_3d,     0}; +act9 acom0b_3d =       {INIT_OBJSTATE, 0,                  NAT1_3d,     1}; +act9 acom1b_3d =       {INIT_OBJSTATE, 0,                  NAT1_3d,     2}; +act9 acom2b_3d =       {INIT_OBJSTATE, 0,                  NAT1_3d,     3}; +act9 acom3b_3d =       {INIT_OBJSTATE, 0,                  NAT1_3d,     4}; +act9 acom4b_3d =       {INIT_OBJSTATE, 0,                  NAT1_3d,     5}; +act9 acom5b_3d =       {INIT_OBJSTATE, 0,                  NAT1_3d,     6}; +act9 acom6b_3d =       {INIT_OBJSTATE, 0,                  NAT1_3d,     7}; +act9 acom7b_3d =       {INIT_OBJSTATE, 0,                  NAT1_3d,     8}; +act9 acom8b_3d =       {INIT_OBJSTATE, 0,                  NAT1_3d,     9}; +act9 adart1_3d =       {INIT_OBJSTATE, 0,                  BLOWPIPE_3d, 1}; +act9 adn2_3d =         {INIT_OBJSTATE, 0,                  HERO,        0}; +act9 adrink_3d =       {INIT_OBJSTATE, 0,                  FLASK_3d,    0}; +act9 adropcheese3_3d = {INIT_OBJSTATE, 0,                  CHEESE_3d,   1}; +act9 aelewoken_3d =    {INIT_OBJSTATE, 0,                  ELEPHANT_3d, 0}; +act9 aemptyflask_3d =  {INIT_OBJSTATE, 0,                  FLASK_3d,    0}; +act9 aendaction_3d =   {INIT_OBJSTATE, DARTTIME + 30,      E_EYES_3d,   0}; +act9 aenter1_3d =      {INIT_OBJSTATE, 0,                  MOUSE_3d,    2}; +act9 aex7_3d =         {INIT_OBJSTATE, 0,                  GHOST_3d,    1}; +act9 afillmagic3_3d =  {INIT_OBJSTATE, 0,                  FLASK_3d,    2}; +act9 afillord2_3d =    {INIT_OBJSTATE, 0,                  FLASK_3d,    1}; +act9 afindb1_3d =      {INIT_OBJSTATE, 0,                  BOOK_3d,     1}; +act9 agive3_3d =       {INIT_OBJSTATE, 0,                  NAT1_3d,     10}; +act9 agot1_3d =        {INIT_OBJSTATE, 0,                  DOCTOR_3d,   1}; +act9 ahelp2_3d =       {INIT_OBJSTATE, 0,                  HERO,        1}; +act9 ahole5a_3d =      {INIT_OBJSTATE, 0,                  MOUSE_3d,    1}; +act9 ahole5b_3d =      {INIT_OBJSTATE, 0,                  MOUSE_3d,    0}; +act9 amakeclay2_3d =   {INIT_OBJSTATE, 0,                  CLAY_3d,     1}; +act9 amission1_3d =    {INIT_OBJSTATE, 0,                  PENNY_3d,    2}; +act9 amousefree_3d =   {INIT_OBJSTATE, 0,                  MOUSE_3d,    3}; +act9 aoldstate_3d =    {INIT_OBJSTATE, 0,                  MOUTH_3d,    1}; +act9 aopen2_3d =       {INIT_OBJSTATE, 0,                  CDOOR_3d,    1}; +act9 apause0_3d =      {INIT_OBJSTATE, 3 * NORMAL_TPS_v2d, NAT2_3d,     0}; +act9 apause1_3d =      {INIT_OBJSTATE, 0,                  NAT2_3d,     1}; +act9 astartaction_3d = {INIT_OBJSTATE, 0,                  E_EYES_3d,   1}; +act9 astick3_3d =      {INIT_OBJSTATE, 0,                  DOCTOR_3d,   2}; +act9 atakecheese1_3d = {INIT_OBJSTATE, 0,                  CHEESE_3d,   0}; +act9 aup2_3d =         {INIT_OBJSTATE, 0,                  HERO,        1}; +act9 avine6_3d =       {INIT_OBJSTATE, 0,                  BLOCK1_3d,   1}; +act9 aweb1_3d =        {INIT_OBJSTATE, 0,                  PENNY_3d,    1};  act10 acamp1a_3d =  {INIT_PATH, 0,  NAT2_3d,   AUTO,    0,      0};  act10 acamp1b_3d =  {INIT_PATH, 0,  NATG_3d,   AUTO,    0,      0}; @@ -10983,58 +10985,58 @@ act10 aenable_3d =  {INIT_PATH, 0,  HERO,      USER,    0,      0};  act10 ahoriz6_3d =  {INIT_PATH, 1,  HERO,      USER,    0,      0};  act10 aquiet_3d =   {INIT_PATH, 0,  HERO,      QUIET,   0,      0}; -act11 aactiontest1_3d = {COND_R, 0,               E_EYES_3d,   1,  0,                 kALoktoleave1_3d}; -act11 aactiontest2_3d = {COND_R, 0,               E_EYES_3d,   1,  0,                 kALoktoleave2_3d}; -act11 ablktest_3d =     {COND_R, 0,               BLOCK1_3d,   0,  kALblk1_3d,           0}; -act11 abrgmsgtest_3d =  {COND_R, 0,               VINE_3d,     0,  kALbrg_clftop_msg_3d, kALbrg_clftop1_3d}; -act11 abrgtest_3d =     {COND_R, 0,               VINE_3d,     0,  kALbrg_ok_3d,         kALbrg_down_3d}; -act11 acagetest_3d =    {COND_R, 0,               MOUSE_3d,    2,  0,                 kALpostest_3d}; -act11 acagetest1_3d =   {COND_R, 0,               MOUSE_3d,    2,  kALcagetest2_3d,      kALok_3d}; -act11 acamptest_3d =    {COND_R, 0,               NAT1_3d,     0,  kALcampers_3d,        kALchase_3d}; -act11 acavetest_3d =    {COND_R, 0,               GHOST_3d,    0,  kALspirit_3d,         kALcave_man_3d}; -act11 acrashtest1_3d =  {COND_R, 0,               PENNY_3d,    0,  kALcrashed_3d,        kALcrashtest2_3d}; -act11 acrashtest2_3d =  {COND_R, 0,               PENNY_3d,    1,  kALcryhelp_3d,        0}; -act11 adartedtest_3d =  {COND_R, 0,               BLOWPIPE_3d, 0,  kALdodart_3d,         kALdarted_3d}; -act11 adoctest_3d =     {COND_R, 0,               DOCTOR_3d,   0,  kALdoc_3d,            0}; -act11 adrinktest_3d =   {COND_R, 0,               FLASK_3d,    0,  kALdrinkno_3d,        kALdrinkyes_3d}; -act11 aeletest1_3d =    {COND_R, 0,               ELEPHANT_3d, 1,  kALele_sleep_3d,      kALeletest2_3d}; -act11 aeletest2_3d =    {COND_R, 0,               ELEPHANT_3d, 0,  kALeleblink_3d,       0}; -act11 aemptytest1_3d =  {COND_R, 0,               FLASK_3d,    2,  kALemptymagic_3d,     kALemptytest2_3d}; -act11 aemptytest2_3d =  {COND_R, 0,               FLASK_3d,    1,  kALemptyord_3d,       kALdrinkno_3d}; -act11 aentertest1_3d =  {COND_R, 0,               CHEESE_3d,   1,  kALentertest2_3d,     0}; -act11 aentertest2_3d =  {COND_R, 0,               MOUSE_3d,    0,  kALentertest3_3d,     0}; -act11 aexotest1_3d =    {COND_R, 0,               GHOST_3d,    0,  kALexotest2_3d,       kALexordone_3d}; -act11 afindbtest_3d =   {COND_R, 0,               BOOK_3d,     0,  kALfindit_3d,         0}; -act11 aflasktest2_3d =  {COND_R, 0,               FLASK_3d,    2,  kALremedy_3d,         kALflasktest3_3d}; -act11 aflasktest3_3d =  {COND_R, 0,               FLASK_3d,    1,  kALnoremedy_3d,       kALrefuseflask_3d}; -act11 agettest2_3d =    {COND_R, 0,               DOCTOR_3d,   0,  kALgot_3d,            0}; -act11 agivetest_3d =    {COND_R, 0,               NAT1_3d,     10, kALrefuse_3d,         kALgive_3d}; -act11 anat0_3d =        {COND_R, 0,               NAT1_3d,     0,  kALcom0_3d,           kALnat1_3d}; -act11 anat1_3d =        {COND_R, 0,               NAT1_3d,     1,  kALcom1_3d,           kALnat2_3d}; -act11 anat2_3d =        {COND_R, 0,               NAT1_3d,     2,  kALcom2_3d,           kALnat3_3d}; -act11 anat3_3d =        {COND_R, 0,               NAT1_3d,     3,  kALcom3_3d,           kALnat4_3d}; -act11 anat4_3d =        {COND_R, 0,               NAT1_3d,     4,  kALcom4_3d,           kALnat5_3d}; -act11 anat5_3d =        {COND_R, 0,               NAT1_3d,     5,  kALcom5_3d,           kALnat6_3d}; -act11 anat6_3d =        {COND_R, 0,               NAT1_3d,     6,  kALcom6_3d,           kALnat7_3d}; -act11 anat7_3d =        {COND_R, 0,               NAT1_3d,     7,  kALcom7_3d,           kALnat8_3d}; -act11 anat8_3d =        {COND_R, 0,               NAT1_3d,     8,  kALcom8_3d,           0}; -act11 aold5_3d =        {COND_R, 0,               FLASK_3d,    2,  kALold6_3d,           kALwrong_3d}; -act11 aoldmantest_3d =  {COND_R, 0,               MOUTH_3d,    0,  kALoldfirst_3d,       kALoldsubseq_3d}; -act11 aopentest_3d =    {COND_R, 0,               DOCTOR_3d,   1,  kALprod_3d,           kALopencdoor_3d}; -act11 apausetest_3d =   {COND_R, 0,               NAT2_3d,     1,  0,                 kALcomment_3d}; -act11 apostest_3d =     {COND_R, 0,               MOUSE_3d,    0,  kALmousel_3d,         kALmouser_3d}; -act11 aspirittest_3d =  {COND_R, 0,               GHOST_3d,    0,  kALwarn_3d,           0}; -act11 asticktest1_3d =  {COND_R, 0,               DOCTOR_3d,   2,  kALstuckpin_3d,       kALsticktest2_3d}; -act11 asticktest2_3d =  {COND_R, 0,               CLAY_3d,     1,  kALstickpin_3d,       kALnostickpin_3d}; -act11 ataketest1_3d =   {COND_R, 0,               MOUSE_3d,    2,  kALtakeit_3d,         kALcanttake_3d}; -act11 ataketest2_3d =   {COND_R, 0,               MOUSE_3d,    3,  kALmousegone_3d,      kALtaketest1_3d}; -act11 atalktest1_3d =   {COND_R, 0,               NAT1_3d,     9,  kALnat9_3d,           kALnative_3d}; -act11 atiptest_3d =     {COND_R, 60 * NORMAL_TPS, BLOCK1_3d,   0,  kALbtipprompt_3d,     0}; -act11 auntietest_3d =   {COND_R, 0,               BLOCK1_3d,   0,  kALnottied_3d,        kALuntie_3d}; -act11 avinetest_3d =    {COND_R, 0,               BLOCK1_3d,   0,  kALtievine_3d,        kALtied_3d}; -act11 awebtest1_3d =    {COND_R, 0,               PENNY_3d,    0,  kALspider_3d,         kALwebtest2_3d}; -act11 awebtest2_3d =    {COND_R, 0,               PENNY_3d,    1,  kALmission_3d,        kALreturn_3d}; -act11 ahoriz5_3d =      {COND_R, 1,               HERO,        0,  kALup_3d,             kALdn_3d}; +act11 aactiontest1_3d = {COND_R, 0,                   E_EYES_3d,   1,  0,                 kALoktoleave1_3d}; +act11 aactiontest2_3d = {COND_R, 0,                   E_EYES_3d,   1,  0,                 kALoktoleave2_3d}; +act11 ablktest_3d =     {COND_R, 0,                   BLOCK1_3d,   0,  kALblk1_3d,           0}; +act11 abrgmsgtest_3d =  {COND_R, 0,                   VINE_3d,     0,  kALbrg_clftop_msg_3d, kALbrg_clftop1_3d}; +act11 abrgtest_3d =     {COND_R, 0,                   VINE_3d,     0,  kALbrg_ok_3d,         kALbrg_down_3d}; +act11 acagetest_3d =    {COND_R, 0,                   MOUSE_3d,    2,  0,                 kALpostest_3d}; +act11 acagetest1_3d =   {COND_R, 0,                   MOUSE_3d,    2,  kALcagetest2_3d,      kALok_3d}; +act11 acamptest_3d =    {COND_R, 0,                   NAT1_3d,     0,  kALcampers_3d,        kALchase_3d}; +act11 acavetest_3d =    {COND_R, 0,                   GHOST_3d,    0,  kALspirit_3d,         kALcave_man_3d}; +act11 acrashtest1_3d =  {COND_R, 0,                   PENNY_3d,    0,  kALcrashed_3d,        kALcrashtest2_3d}; +act11 acrashtest2_3d =  {COND_R, 0,                   PENNY_3d,    1,  kALcryhelp_3d,        0}; +act11 adartedtest_3d =  {COND_R, 0,                   BLOWPIPE_3d, 0,  kALdodart_3d,         kALdarted_3d}; +act11 adoctest_3d =     {COND_R, 0,                   DOCTOR_3d,   0,  kALdoc_3d,            0}; +act11 adrinktest_3d =   {COND_R, 0,                   FLASK_3d,    0,  kALdrinkno_3d,        kALdrinkyes_3d}; +act11 aeletest1_3d =    {COND_R, 0,                   ELEPHANT_3d, 1,  kALele_sleep_3d,      kALeletest2_3d}; +act11 aeletest2_3d =    {COND_R, 0,                   ELEPHANT_3d, 0,  kALeleblink_3d,       0}; +act11 aemptytest1_3d =  {COND_R, 0,                   FLASK_3d,    2,  kALemptymagic_3d,     kALemptytest2_3d}; +act11 aemptytest2_3d =  {COND_R, 0,                   FLASK_3d,    1,  kALemptyord_3d,       kALdrinkno_3d}; +act11 aentertest1_3d =  {COND_R, 0,                   CHEESE_3d,   1,  kALentertest2_3d,     0}; +act11 aentertest2_3d =  {COND_R, 0,                   MOUSE_3d,    0,  kALentertest3_3d,     0}; +act11 aexotest1_3d =    {COND_R, 0,                   GHOST_3d,    0,  kALexotest2_3d,       kALexordone_3d}; +act11 afindbtest_3d =   {COND_R, 0,                   BOOK_3d,     0,  kALfindit_3d,         0}; +act11 aflasktest2_3d =  {COND_R, 0,                   FLASK_3d,    2,  kALremedy_3d,         kALflasktest3_3d}; +act11 aflasktest3_3d =  {COND_R, 0,                   FLASK_3d,    1,  kALnoremedy_3d,       kALrefuseflask_3d}; +act11 agettest2_3d =    {COND_R, 0,                   DOCTOR_3d,   0,  kALgot_3d,            0}; +act11 agivetest_3d =    {COND_R, 0,                   NAT1_3d,     10, kALrefuse_3d,         kALgive_3d}; +act11 anat0_3d =        {COND_R, 0,                   NAT1_3d,     0,  kALcom0_3d,           kALnat1_3d}; +act11 anat1_3d =        {COND_R, 0,                   NAT1_3d,     1,  kALcom1_3d,           kALnat2_3d}; +act11 anat2_3d =        {COND_R, 0,                   NAT1_3d,     2,  kALcom2_3d,           kALnat3_3d}; +act11 anat3_3d =        {COND_R, 0,                   NAT1_3d,     3,  kALcom3_3d,           kALnat4_3d}; +act11 anat4_3d =        {COND_R, 0,                   NAT1_3d,     4,  kALcom4_3d,           kALnat5_3d}; +act11 anat5_3d =        {COND_R, 0,                   NAT1_3d,     5,  kALcom5_3d,           kALnat6_3d}; +act11 anat6_3d =        {COND_R, 0,                   NAT1_3d,     6,  kALcom6_3d,           kALnat7_3d}; +act11 anat7_3d =        {COND_R, 0,                   NAT1_3d,     7,  kALcom7_3d,           kALnat8_3d}; +act11 anat8_3d =        {COND_R, 0,                   NAT1_3d,     8,  kALcom8_3d,           0}; +act11 aold5_3d =        {COND_R, 0,                   FLASK_3d,    2,  kALold6_3d,           kALwrong_3d}; +act11 aoldmantest_3d =  {COND_R, 0,                   MOUTH_3d,    0,  kALoldfirst_3d,       kALoldsubseq_3d}; +act11 aopentest_3d =    {COND_R, 0,                   DOCTOR_3d,   1,  kALprod_3d,           kALopencdoor_3d}; +act11 apausetest_3d =   {COND_R, 0,                   NAT2_3d,     1,  0,                 kALcomment_3d}; +act11 apostest_3d =     {COND_R, 0,                   MOUSE_3d,    0,  kALmousel_3d,         kALmouser_3d}; +act11 aspirittest_3d =  {COND_R, 0,                   GHOST_3d,    0,  kALwarn_3d,           0}; +act11 asticktest1_3d =  {COND_R, 0,                   DOCTOR_3d,   2,  kALstuckpin_3d,       kALsticktest2_3d}; +act11 asticktest2_3d =  {COND_R, 0,                   CLAY_3d,     1,  kALstickpin_3d,       kALnostickpin_3d}; +act11 ataketest1_3d =   {COND_R, 0,                   MOUSE_3d,    2,  kALtakeit_3d,         kALcanttake_3d}; +act11 ataketest2_3d =   {COND_R, 0,                   MOUSE_3d,    3,  kALmousegone_3d,      kALtaketest1_3d}; +act11 atalktest1_3d =   {COND_R, 0,                   NAT1_3d,     9,  kALnat9_3d,           kALnative_3d}; +act11 atiptest_3d =     {COND_R, 60 * NORMAL_TPS_v2d, BLOCK1_3d,   0,  kALbtipprompt_3d,     0}; +act11 auntietest_3d =   {COND_R, 0,                   BLOCK1_3d,   0,  kALnottied_3d,        kALuntie_3d}; +act11 avinetest_3d =    {COND_R, 0,                   BLOCK1_3d,   0,  kALtievine_3d,        kALtied_3d}; +act11 awebtest1_3d =    {COND_R, 0,                   PENNY_3d,    0,  kALspider_3d,         kALwebtest2_3d}; +act11 awebtest2_3d =    {COND_R, 0,                   PENNY_3d,    1,  kALmission_3d,        kALreturn_3d}; +act11 ahoriz5_3d =      {COND_R, 1,                   HERO,        0,  kALup_3d,             kALdn_3d};  act12 ablk1_3d =         {TEXT, 0,   kSTBlk1_3d};  act12 abook1_3d =        {TEXT, 0,   kSTBook1_3d};  | 
