TOOL: Fix palette bug in H3 Dos (when leaving the cave)

svn-id: r54898

5 files changed, 34 insertions, 44 deletions

diff --git a/dists/engine-data/hugo.dat b/dists/engine-data/hugo.dat
index 2963f5d447..ac68a840b5 100644
--- a/dists/engine-data/hugo.dat
+++ b/dists/engine-data/hugo.dat
diff --git a/engines/hugo/hugo.h b/engines/hugo/hugo.h
index 9fea091491..bf2e566ce0 100644
--- a/engines/hugo/hugo.h
+++ b/engines/hugo/hugo.h
@@ -35,7 +35,7 @@
 #include "hugo/file.h"
 
 #define HUGO_DAT_VER_MAJ 0                          // 1 byte
-#define HUGO_DAT_VER_MIN 33                         // 1 byte
+#define HUGO_DAT_VER_MIN 34                         // 1 byte
 #define DATAALIGNMENT    4
 #define EDGE             10                         // Closest object can get to edge of screen
 #define EDGE2            (EDGE * 2)                 // Push object further back on edge collision
diff --git a/tools/create_hugo/create_hugo.h b/tools/create_hugo/create_hugo.h
index d2fab6ec0d..82b6f1ffd5 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 33 // 1 byte
+#define HUGO_DAT_VER_MIN 34 // 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 e10cbe19b0..5471c2526f 100644
--- a/tools/create_hugo/enums.h
+++ b/tools/create_hugo/enums.h
@@ -1493,16 +1493,6 @@ enum objid_3d {
 	PLANT5_3d,   LASTOBJ_3d
 };
 
-#define _BLUE         1
-#define _BLACK        0
-#define _LIGHTYELLOW  14
-#define _LIGHTMAGENTA 13
-#define _LIGHTRED     4
-#define _CYAN         3
-
-// TODO: Added by Strangerke, to be validated
-#define _GRAY         7
-
 // Enumerate sequence index matching direction of travel
 enum {RIGHT, LEFT, DOWN, _UP};
 
diff --git a/tools/create_hugo/staticdata.h b/tools/create_hugo/staticdata.h
index e9da6ea668..3c78f88f41 100644
--- a/tools/create_hugo/staticdata.h
+++ b/tools/create_hugo/staticdata.h
@@ -5877,18 +5877,18 @@ act3 amanq5_1w = {PROMPT, 0, kSTsq5_1w,    rep5_1w,    kALrepyes5_1w, kALrepno1_
 act3 amanq6_1w = {PROMPT, 0, kSTsq6_1w,    rep6_1w,    kALrepyes6_1w, kALrepno1_1w, false};
 act3 amanq7_1w = {PROMPT, 0, kSTsq7_1w,    rep7_1w,    kALrepyes7_1w, kALrepno3_1w, false};
 
-act4 abk1_1w     = {BKGD_COLOR, 0,  _BLUE};
-act4 abknorm1_1w = {BKGD_COLOR, 0,  _BLACK};
-act4 abk2_1w     = {BKGD_COLOR, 2,  _BLUE};
-act4 abknorm2_1w = {BKGD_COLOR, 3,  _BLACK};
-act4 abg1_1w     = {BKGD_COLOR, 0,  _LIGHTYELLOW};
-act4 abg2_1w     = {BKGD_COLOR, 2,  _LIGHTMAGENTA};
-act4 abg3_1w     = {BKGD_COLOR, 4,  _LIGHTRED};
-act4 abg4_1w     = {BKGD_COLOR, 6,  _BLACK};
-act4 abg5_1w     = {BKGD_COLOR, 8,  _LIGHTYELLOW};
-act4 abg6_1w     = {BKGD_COLOR, 10, _LIGHTMAGENTA};
-act4 abg7_1w     = {BKGD_COLOR, 12, _LIGHTRED};
-act4 abg8_1w     = {BKGD_COLOR, 14, _BLACK};
+act4 abk1_1w     = {BKGD_COLOR, 0,  _TBLUE};
+act4 abknorm1_1w = {BKGD_COLOR, 0,  _TBLACK};
+act4 abk2_1w     = {BKGD_COLOR, 2,  _TBLUE};
+act4 abknorm2_1w = {BKGD_COLOR, 3,  _TBLACK};
+act4 abg1_1w     = {BKGD_COLOR, 0,  _TLIGHTYELLOW};
+act4 abg2_1w     = {BKGD_COLOR, 2,  _TLIGHTMAGENTA};
+act4 abg3_1w     = {BKGD_COLOR, 4,  _TLIGHTRED};
+act4 abg4_1w     = {BKGD_COLOR, 6,  _TBLACK};
+act4 abg5_1w     = {BKGD_COLOR, 8,  _TLIGHTYELLOW};
+act4 abg6_1w     = {BKGD_COLOR, 10, _TLIGHTMAGENTA};
+act4 abg7_1w     = {BKGD_COLOR, 12, _TLIGHTRED};
+act4 abg8_1w     = {BKGD_COLOR, 14, _TBLACK};
 
 act5 aopendoor1b_1w = {INIT_OBJVXY, 0,                  HERO,      DX,     -DY};
 act5 abatvxy1_1w    = {INIT_OBJVXY, 0,                  BAT_1w,    2,      -2};
@@ -8935,18 +8935,18 @@ act3 amanq6_1d = {PROMPT, 0,                       kSTsq6_1d,     rep6_1d,    kA
 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};
-act4 abg3_1d =     {BKGD_COLOR, 4,  _LIGHTRED};
-act4 abg4_1d =     {BKGD_COLOR, 6,  _BLACK};
-act4 abg5_1d =     {BKGD_COLOR, 8,  _LIGHTYELLOW};
-act4 abg6_1d =     {BKGD_COLOR, 10, _LIGHTMAGENTA};
-act4 abg7_1d =     {BKGD_COLOR, 12, _LIGHTRED};
-act4 abg8_1d =     {BKGD_COLOR, 14, _BLACK};
-act4 abk1_1d =     {BKGD_COLOR, 0,  _BLUE};
-act4 abk2_1d =     {BKGD_COLOR, 2,  _BLUE};
-act4 abknorm1_1d = {BKGD_COLOR, 0,  _BLACK};
-act4 abknorm2_1d = {BKGD_COLOR, 3,  _BLACK};
+act4 abg1_1d =     {BKGD_COLOR, 0,  _TLIGHTYELLOW};
+act4 abg2_1d =     {BKGD_COLOR, 2,  _TLIGHTMAGENTA};
+act4 abg3_1d =     {BKGD_COLOR, 4,  _TLIGHTRED};
+act4 abg4_1d =     {BKGD_COLOR, 6,  _TBLACK};
+act4 abg5_1d =     {BKGD_COLOR, 8,  _TLIGHTYELLOW};
+act4 abg6_1d =     {BKGD_COLOR, 10, _TLIGHTMAGENTA};
+act4 abg7_1d =     {BKGD_COLOR, 12, _TLIGHTRED};
+act4 abg8_1d =     {BKGD_COLOR, 14, _TBLACK};
+act4 abk1_1d =     {BKGD_COLOR, 0,  _TBLUE};
+act4 abk2_1d =     {BKGD_COLOR, 2,  _TBLUE};
+act4 abknorm1_1d = {BKGD_COLOR, 0,  _TBLACK};
+act4 abknorm2_1d = {BKGD_COLOR, 3,  _TBLACK};
 
 act5 abox0_1d =      {INIT_OBJVXY, 0,                  GDOOR_1d,  6,      0};
 act5 abox1_1d =      {INIT_OBJVXY, 9,                  GDOOR_1d,  0,      0};
@@ -10322,8 +10322,8 @@ 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};
+act35 amap0_2d = {REMAPPAL, 0, _TLIGHTMAGENTA, _TLIGHTMAGENTA};
+act35 amap1_2d = {REMAPPAL, 0, _TLIGHTMAGENTA, _TBLACK};
 
 act36 achkcat1_2d   = {COND_NOUN, 0, kNBell_2d,  kALcat1_2d,    kALnopurps_2d};
 act36 achkpencil_2d = {COND_NOUN, 0, kNKey_2d,   kALchkpap1_2d, kALnopurps_2d};
@@ -11258,12 +11258,12 @@ act33 amission2_3d = {INIT_SCREEN, 0, NATG_3d,   WEB_3d};
 act33 areturn5_3d =  {INIT_SCREEN, 0, NATG_3d,   WEB_3d};
 act33 aweb3_3d =     {INIT_SCREEN, 0, PENNY_3d,  WEB_3d};
 
-act35 amap0_3d =  {REMAPPAL, 0, _TRED,          _LIGHTYELLOW};
-act35 amap1_3d =  {REMAPPAL, 0, _TLIGHTMAGENTA, _BLACK};
-act35 amap4a_3d = {REMAPPAL, 0, _TGRAY,         _BLACK};
-act35 amap4b_3d = {REMAPPAL, 1, _TGRAY,         _GRAY};
-act35 amap4c_3d = {REMAPPAL, 2, _TGRAY,         _BLACK};
-act35 amap4d_3d = {REMAPPAL, 3, _TGRAY,         _GRAY};
+act35 amap0_3d =  {REMAPPAL, 0, _TRED,          _TLIGHTYELLOW};
+act35 amap1_3d =  {REMAPPAL, 0, _TLIGHTMAGENTA, _TBLACK};
+act35 amap4a_3d = {REMAPPAL, 0, _TGRAY,         _TBLACK};
+act35 amap4b_3d = {REMAPPAL, 1, _TGRAY,         _TGRAY};
+act35 amap4c_3d = {REMAPPAL, 2, _TGRAY,         _TBLACK};
+act35 amap4d_3d = {REMAPPAL, 3, _TGRAY,         _TGRAY};
 
 act36 adroptest2_3d =  {COND_NOUN, 0, kNCage_3d, kALcagetest_3d,   kALdropord_3d};
 act36 asticktest3_3d = {COND_NOUN, 0, kNClay_3d, kALsticktest4_3d, kALnostick_3d};