From f7032c126dd097e8083e0fc740c7c856e0f2dd58 Mon Sep 17 00:00:00 2001
From: athrxx <athrxx@scummvm.org>
Date: Wed, 17 Aug 2011 18:46:29 +0200
Subject: [PATCH] KYRA: (EOB) - fix some bugs

- fix monster movement
- fix character level gain
- add some static res for party transfer
---
 devtools/create_kyradat/create_kyradat.cpp |   6 +++
 devtools/create_kyradat/create_kyradat.h   |   3 ++
 devtools/create_kyradat/games.cpp          |   2 +
 devtools/create_kyradat/tables.cpp         |  13 ++++++
 dists/engine-data/kyra.dat                 | Bin 465075 -> 465202 bytes
 engines/kyra/chargen.cpp                   |  13 ++++--
 engines/kyra/eob1.cpp                      |   4 +-
 engines/kyra/eobcommon.cpp                 |  30 +++++++++----
 engines/kyra/eobcommon.h                   |   8 +++-
 engines/kyra/gui_eob.cpp                   |   4 +-
 engines/kyra/lol.cpp                       |   1 +
 engines/kyra/loleobbase.cpp                |  16 +++----
 engines/kyra/resource.h                    |   3 ++
 engines/kyra/scene_eob.cpp                 |   8 ++--
 engines/kyra/screen_eob.cpp                |  24 ++++++-----
 engines/kyra/sprites_eob.cpp               |  48 ++++++++++++---------
 engines/kyra/staticres_eob.cpp             |   3 ++
 engines/kyra/timer.cpp                     |   4 ++
 engines/kyra/timer_eob.cpp                 |   3 ++
 engines/kyra/timer_lol.cpp                 |   1 +
 20 files changed, 130 insertions(+), 64 deletions(-)

diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp
index 069118bdabe..ad56fb44c24 100644
--- a/devtools/create_kyradat/create_kyradat.cpp
+++ b/devtools/create_kyradat/create_kyradat.cpp
@@ -463,6 +463,8 @@ const ExtractFilename extractFilenames[] = {
 
 	// EYE OF THE BEHOLDER II
 	{ kEob2MainMenuStrings, kTypeStringList, true },
+	{ kEob2TransferConvertTable, kTypeRawData, false },
+	{ kEob2TransferExpTable, kLolTypeRaw32, false },
 
 	{ kEob2IntroStrings, k2TypeSfxList, true },
 	{ kEob2IntroCPSFiles, kTypeStringList, true },
@@ -1779,6 +1781,10 @@ const char *getIdString(const int id) {
 		return "kEob1Npc7Strings";
 	case kEob2MainMenuStrings:
 		return "kEob2MainMenuStrings";
+	case kEob2TransferConvertTable:
+		return "kEob2TransferConvertTable";
+	case kEob2TransferExpTable:
+		return "kEob2TransferExpTable";
 	case kEob2IntroStrings:
 		return "kEob2IntroStrings";
 	case kEob2IntroCPSFiles:
diff --git a/devtools/create_kyradat/create_kyradat.h b/devtools/create_kyradat/create_kyradat.h
index c7a29fb99a3..d7bcc4d9865 100644
--- a/devtools/create_kyradat/create_kyradat.h
+++ b/devtools/create_kyradat/create_kyradat.h
@@ -463,6 +463,9 @@ enum kExtractID {
 	kEob1Npc7Strings,
 
 	kEob2MainMenuStrings,
+	kEob2TransferConvertTable,
+	kEob2TransferExpTable,
+
 	kEob2IntroStrings,
 	kEob2IntroCPSFiles,
 	kEob2IntroSeqData00,
diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp
index d5b5c29aa99..78baeb6b39e 100644
--- a/devtools/create_kyradat/games.cpp
+++ b/devtools/create_kyradat/games.cpp
@@ -1485,6 +1485,8 @@ const int eob2FloppyNeed[] = {
 	kEobBaseFlightObjSclIndex,
 
 	kEob2MainMenuStrings,
+	kEob2TransferConvertTable,
+	kEob2TransferExpTable,
 
 	kEob2IntroStrings,
 	kEob2IntroCPSFiles,
diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp
index 0b249247d8e..239ee6e1bd6 100644
--- a/devtools/create_kyradat/tables.cpp
+++ b/devtools/create_kyradat/tables.cpp
@@ -2649,6 +2649,16 @@ const ExtractEntrySearchData kEob2MainMenuStringsProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
+const ExtractEntrySearchData kEob2TransferConvertTableProvider[] = {
+	{ UNK_LANG, kPlatformUnknown, { 0x00000031, 0x000004BC, { { 0x96, 0x53, 0xA2, 0xF1, 0x26, 0xFE, 0x1B, 0x5E, 0xDF, 0x62, 0x2C, 0x8C, 0xBD, 0x62, 0x5A, 0xF9 } } } },
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob2TransferExpTableProvider[] = {
+	{ UNK_LANG, kPlatformUnknown, { 0x00000018, 0x0000076B, { { 0x91, 0x65, 0x5B, 0x8D, 0xE8, 0x5B, 0x28, 0x32, 0x4D, 0x7A, 0x57, 0x8E, 0x18, 0x5B, 0x1A, 0xE9 } } } },
+	EXTRACT_END_ENTRY
+};
+
 const ExtractEntrySearchData kEob2IntroStringsProvider[] = {
 	{ EN_ANY, kPlatformUnknown, { 0x00000321, 0x0000DBC3, { { 0x11, 0x9B, 0x54, 0xB3, 0x34, 0xF0, 0xB5, 0xE1, 0xFA, 0x6A, 0x31, 0x02, 0x59, 0x29, 0xCA, 0x94 } } } },
 	{ DE_DEU, kPlatformUnknown, { 0x0000038E, 0x0001119C, { { 0x92, 0x63, 0x18, 0xDD, 0x9F, 0x62, 0xF5, 0xBC, 0x3D, 0x93, 0xDC, 0x6E, 0xE5, 0xBE, 0x8C, 0x0B } } } },
@@ -4078,6 +4088,9 @@ const ExtractEntry extractProviders[] = {
 	{ kEob1Npc7Strings, kEob1Npc7StringsProvider },
 
 	{ kEob2MainMenuStrings, kEob2MainMenuStringsProvider },
+	{ kEob2TransferConvertTable, kEob2TransferConvertTableProvider },
+	{ kEob2TransferExpTable, kEob2TransferExpTableProvider },
+
 	{ kEob2IntroStrings, kEob2IntroStringsProvider },
 	{ kEob2IntroCPSFiles, kEob2IntroCPSFilesProvider },
 	{ kEob2IntroSeqData00, kEob2IntroSeqData00Provider },
diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat
index 35aff97dde9dd65659b6096be221df2bfd6eb7af..8d45a5f0d63ba9d2b449f52eaa49723c93134642 100644
GIT binary patch
delta 27105
zcmeI4d6X1Ywy#eVMKKQwA|NycwhE{anOT`xpom2cfZ9qcc8l`>+8_#|v;$(4^VAJE
zfvu<@4xoalD5$77Ac}J<;0(yD2nel$qTKIf#QyQ_d-sp~-g<ZSKf0DH{M;vY?%&?$
z>=P$4;i)IuJ^5t2C_TuzFbvaSm<io=f?Vhp3-Y1cA}9}Cixcgh9-$j9s0iKP1XZD%
zET|6MT0u?d@+Tz@Qc;+4*;5nB;=8v&h-F+18U8zT!5M{NKst0KLk$S~F+o}A1`jt&
zHgvb2Z-AiX0)pEfLxek`J79#3Bf3WoQiSl}MTx}+_q2fzu6VS!q(~mYeRZ(`!7Ysp
z2rgY~KyWj!G9b8@uW>GlJrG^fYt7UrbmfA|&|P(tS%~{C0b#!>AnZTfoDB0}_nlyn
zO1S|7f(vgm3&DLF-EBm4uS_<`rrbVL400)VfFPf8WrFgQ>m%rqa(@?8q}*IVpOo7!
zs7$#IQ_Xc%M0BF+l)F+;lX4#$q*1h4fTAPrPdud4DR+|~lX8y;%2KX+nhitH7y*KA
zPaq1@%<fLpZ5%~jAYgV+oM9Gb_x_I<P@?@GHK0T%2`JIP$IL>BE)r0pl?Kc@clS(&
zG5=Y4OrTdh6@VI*%}OAPh+U5xAfnrB1JeD|oCI>X+w`=7_ckv9T)HmLC6Ed;F0;TO
zm2uSzY^J8N8Q0`BGvzX_gCL)A-2~+sS1IU`akmL7GVUcopNwm?(7aV<+~I<%jJr%w
zor&CYq8dK+_2i~Bq2>jII#ZC&xbFm+jBByT?kUT-*9BhC8)iXJH-jw0PF|c?qAcU4
z7-dm(_j`$ny11ebJotY|>ZE@fP@=zmYQQpDFJKiN_k~$l<3pDlu*ByGm_J_@fb}1S
zOrZVN*f=IoF98#1xPS??#lWxeufI<2NwFff2?*}PZ_Pq*V}CFpxFJ6pFquC1*+sFu
z6iZ^w&t_tcZxyh{-A=PG>5dez#zzZS<If0K<6j7>Qm*MQ=71&MTfh>JCK~xQK2w0A
z`oAVO`8D28z#9LHfaOtVmkmQv4*`OX6|lrt)Cpp#X_ojE#Rd^;d|+K8*7#}xHCkO_
z7E08no&hD=v%Uc(N((5_eFlDw4{DGM^Gm!|K#8`-K>ah+s9r-GM~!+4m_X+Vm_Snm
zDEd%<qLN1D06~We5Hw1Fp!);}dK)Orzc7QM9WtS4|HkGHMaLPGp=i7SMe_wH`a*!9
zUj+zi(IoL!hM>*@1oetUC^}YvqH_c&x?F&w#{?+)T!5m+P3?mabg00uA_0OX8)WIf
z?qd;(b_r0lf3w707DZ<Ym~^f7Fbk7zkN`z@2oQ9?06~u#_@4Yzi`aqh{~1@@HgT7t
z)3p-Nnhxq<7FyU*0($aE0($aD0Ud0CfS$ZjKu<0&HE;Cf^E?#lpQ0&0EK_yHtrO6b
zkLsA*<a_d90g-+xpeO&XlMSOMA1<KTZWAD==e{-!K_~4SCFGm(9s3zD?neXPhO0X#
zmQ<K_J-QjB(ymI7O}nErX33@9NI^dBt`(H0-Ccqn>BxO8sz|$bW#*wz+6@&{rrn)_
zs<iuFP@Q(&vvyBS+Kn?v6X`Sokv7XE!_w)rJHa4IXVUI6qjXu?73Xanin<F>G{7Ls
zup4?L!?FxpX27$t+wV||C(ODBD-2RuH%pMsy2`%Z;_IKvW!*^y@{rHE;ezt48zbnE
zb*~93vTmoKPu3mL&pxO!>qZKyvTnMdI_tg>)MVXR{exuxNfYWd{SyyqLj6XN&bmX6
zFiR%uP8XDAU7I7#f}-OE2pVmWW!SxcNQPw@_JcvlhelNc5>qNHb9?{EAXVl{1=%t;
z@FcV3%G_{4zRZmkl$W_11wG2#VnIcj`&rPZ%vGFh-lEDfH%wGj=B5g&%iKGHnlcxj
zlH8Og(rN*b-Y-a(x$S}sf=;!2%F5i+0t9W2f%>OW)bzAuT$XW1ongSZy9`1;b^Tcd
z3;O`Aa_kTTTIHzo3}}__3TXb>k!GR!A34f^Ryh&y^AC44@&z){$m?BV<7ni+7tqL$
z6VS+)8KlCzdtz*IPb!sn&j|?bu3EDYT-A*R1b0w$lTkMBz8q(e%e$?DeBSL6l;>TO
z@iwd?@3MkEc{f^6nRj;ys`753pgQk13u>agtDca!OC#bW0U~Az(s{Q@kjcBox7a;p
zd3Ub>4Ic^6@U4K&Xv{>rhs~(Xq!>8=u)S_hC`_}xMt9mcsuKOffU3+9P?ec?nT4vn
zBcLih?@lcK3Fuz}rp!K*%|ccF?t%K36`p|Zmx;105in=!-(xp1XATjd=zIZ+rV0?W
zOn{&!_nHF)^%NlJoO|Q_hY(P7yG$s0S%9KV2L1`C>wSs4G8Fw;fTBwT%(H(85Hw4G
zpjQRCFmfM@Q1q<;MMYEWgHW`$07ZQTD7sjHqK5?tS|&hHy{YC6L3x8Hi=qpSvM9Ps
zfTEWL%(HW+B_6WOvsnVF^0fdBKMK$gJdoTIGPx@rDgY;5K4;E!4~6qDAN1^OGm*N}
zo-iPFd(SZ-b$y>P;8SlEkcIgIvM_bN4I>NB3CO|*0a-Zjg?RtrFvTO;Ij<x)`Qy|`
z0l^JeXcmI|=^X=t`|4c-o&%5m(163onF3BzBLtkL#tJx1MQ?~WPHh!%oXUJ;?l?}J
zDBw7Cvw-8&d;!O)J(nc+_|sGu0fMd(aGLu4QX3X=oT?J>WV>8|qP>>cI23ggP~`ca
znS~;s__+ZSHT=SWiMl{Qi57fm7E1Je3=vOs)M(RkGf|_aD-5X77z5u-vMUpdKTe%2
zphWKqDA6hbC2IAR-NXFpFJS&$4iuh$!VHQYmkC8*2~gB}m3ctX(E=2W5uj+g06|Lx
z2r61_4iMDc!1t1KBN2-36!;Y(K+&fH6m1rusCZ4{y9`Bb1PJOTKv1OsK_>_*IRD%r
zLeV?{iq;EI)OxLb5Q_Q<P;`lb?<I2t2>MKbprUn&1Am%2EP*KWuegrfU?wKrYypZk
z3Q)8|fT9LpC-=}z+@Cil;7?O$Y&GDFa-o1j#f?9jg~P`T57eKv&v9y=OdO})5pbMp
zzuj))IMrXkaq12M$En2vPE*A@>>f^2RRT^^Qw;oRYTk}08J8y1Za*1toEjzIICZ;#
zV^ZIrZ5WEi2~hO7fj>>P{52Wo-*DY!;7?QQU6Fqk;=3N_pU+E-IHar-aH{yOky$u=
zv}kO=ajLU`<5Vv}kF@){fYa1V0!~wno0tPmQ->HtDUMS^jZz$^rU^Js{b=BiQ;nM@
z9@0d5iGbtO%K}bQs{|aA&TD4(Am~m3f}Sma-+%mZs_mZ1IDeeF)4(66*0!{`IWBzK
z)_^n08Ud$@%^l3b;iIV3fYa380!~v02{=t%URqQ*|4<2zQ?q2^IQ6rD<5bs<=8ogk
z2?CB&w+c8;tu^qcsh<TzdQPXrL7LOlYyqdK=$|6aNhj}X<4|<H07cUc{Bf$m{>d<Z
zoVwn?AE%ad_7=WOBCYP+t_H0BGt&mF{uc!i{p`T3ndoPgc>`AeIDv0X0$S6qLv0wX
zY42VJw5A#Xt!c4=-{4>ElMG9RIX9wT0sQ)Bcf2Gf4>@<WfVj^((rzN|CIbx!`+EUR
z>x@BW$>v<ysRnGD{dPmnohk571puE<wo>_=tCfjogmJqe=k5{kz_5Nd<XpGY?1OlC
zIAJ&B+_eIpBwpVQIk!!~V@2EObn{S|bH@pI$hc-V<lMaio;cpy4LSF#fX9#H&oFN_
zIXA(;KZ`uP8*=VBL5lBx_Bu1UDNXLr7Vwzz&~C`N&jmcP?A#4G*WoO4z*h3yZpgX(
zV6#x7^L9hdO-X?B4>fvLrd-Z_EMUtyd#HI}%PAgaz$W^sfTx0C=bD9yI&8QB6ZJj;
z6ZOvX%)&&S=Yh{>1~60iKR+?~=bRM+mQlSCW??#>FJL-eEnqr6BVZM65U`5cjWh=c
zI!1t?t42m<LeV^#P_#*aqJ1u~VJPY+K+$LcitZO6=sg4foYQDj;=rGo$^~i8KZ8Ul
zx=etg@d6Y*AVATx0u;R~K+!4zg0>3~)cHaS0YN7iL}e(t!Ke&H^8_ebFF;Z2ixLn1
zIcJ~%MPme%=zal$z7#Mw=ls<il;zyCOFTrBKg;A?Tc85uT;@_6ht_Kato}W$UfCY>
zg==gW^7gyQ0C@+@t`oQ6Eb0z;!T@#OJe2@V#~uAl9l!tZsUaQliFw|{^z*&D?{fwy
z>iLQRiY5vuQPD!PP@*=A3<!I$fOy6Uh-c~BHjH?pO(N3W{v9)s?x_a8U61}SvG@jE
zD<HVjmzss(8ZI{=xUB+u^1{_-VTmsnM0DOQqVk;EB_PAqYwV_qoEs(RlXLe8=$ju4
zs&a0tpgQL|t~CcV#FGuue*cNV_kR@4lPR5Zn*^Dh+hbkgA<di_CqU850u-$fup-Xi
zX!o!p8h>lRiug*vlo_?Dj^BT%c$ylG+HB*f(Zd32G-ZofDA57|B|7-K#NwOQIsx;i
z=~lB)qR|3Mbd!J*y%33*KwAV%pnbQQ2NeBDfT9}(D0)eNqVEL=>hv#jfS_Xp2)bNQ
z&G~1B2t`W`eAn9Z`^1CqTD=8+(g{#>r2s_}1qganfS?5e1T9G*3d>ORwM;15B|uU4
zA1nkEohCrhcmaxD5>TSe0t9vVF>&CV)=2^cUF9M2<<FvMhD<10BVf|)++iM=biIEv
zV0nz#Wx!NlB;ZpQ6%{AFgsHw)U4XMjnB#K}7LbzH>PBWF3q|z}$U-Xt@)jBRuC+0S
zOu=2QLE#>Nuz%OmfI=K9puPU7y;*p?-}e9kzdtxTWkf)$(gr-A{V^lpEVCOj?%*=B
z5cZ`#4G8;M0mZvjKuWgsPKM<vM8C=eqCAyYY?MdD(N#8%33N-f0Z%EX*9g+CQ(pl;
zQ|Om~&(C?gA?-fi4g7MWe_<HSo<a;Q0P8=@k)Z6cW+Dp*A7|j@4KhI9-v!8<CScO_
zI@N}u_3pD0@LIQ>ZGhC#=NKUM+jEN9fBY|~@@Nf*CMGZ9I)fYq>u{kgX*b#+$GLXM
zSXnaed4rrkmRu)G)_q}+<IUxb<7LUaXn9QRG32Dngn|hmx;^eTU^aCZkgWa>n1$e4
z%@SnXpm_$Qap|)LOs1;m1ZnrAAmY_S>GNhH-NRotAl;V;NcXh@GQ8^bWSGzJA&U*j
z@CyPoRJ>&t5`4|u3HSuBkAe4ZK3hdg6H|@@>qrBCqWfq!q+R(kdC0iQ1>oVqXYL&V
z`B}Ka5Azl}#*6C>NXauB4E%cEQq2BS7)Nt!3&lWl>m*=m?em>k5PsPY33%cE++jcn
zML!!L{Bi-sdrUwUHt$S^`79h2{UXY_83mvrdPVOEP_(F|F2Q*ViWW3AK+(Kr1}G|S
zWkA?F1%!QKyTszdezJo>hW)2&sS%-`C?M2(Iwlq$>YCk<a|d_A!nrEUvzM$C5JHRJ
zn}zxFnSlB8=z(S-+l{)#5QTZteSUW{(QI!OAmUR4A41D88RjR((Yv9{-LM<d?v>q;
zaXUSbxG>N8ux=`Wa<b6Hga7?ySkAQlgG}W9Gy$djtAPAW6p)`!)8>vsoS8N7Pe1}v
zQY#<}ZwNRTPs~Mj6Nlk7IRmoLF>k<$_c8$@T9qf39;9TmfVT+e_Am>F*YN^0Y!INK
zNlzQb?@!$EB1Bv-K*SUQB3>0x*OdYktrJk!Zv~Wfn}GBD@<Z%X5tKbNfv5+H1{+nN
zXubeNI|V4(uUB$Y1t;*F07Vr7*2+i$d)8$Fdf@c}UUA%B0KflKaIl#w6K^u!5KxtG
z1c)d(%tAm!Zvh%+81zBIGXgYp=$+it2Mt{XXsGR7m;J}jz&^zN51EMj0Rf>lJKQ`F
z=}iJ6y+gokx}lE^BkbOl284ZqfUu_s2s>J7R7u?HtCE{4iF;(V0de0UAnrv14wc^s
z&=A(xJ!rU6fQDHDG<4`|!y=;VDq_J`3Fum<7*w%d#|v1la|JBdZ33ox*M5obDuU}J
zAh;t1%!RXJp#D`vcfU*|^-Tdu-7FxfE&H2q@>ph2P39^EB<lhJ@k|vkQ9lsSK7IiT
z&%a?cOYh(#65rJ<y;B4%z2O3u-beup>=FSTqgFr~uMv>OzZuk!tjPj`dn^(W-FyMj
zZ4?k(<0F&cY6$Kq0l{4^psqg%=nFM}uzTnW-T!Dn*!=`m>_4-QH4|~aFCgxZ67WxG
z?qdPv|6G8g6#^8k79eQ701fqzi$8}=3qc9+{DFw(GLhky0z|YHAflZB5v2lh{}%xo
zE)k$%vH>F8ECCu8c<}pAiboLFc3=`6yS(cuK*Wgxsxm=<qDKWNS}8!#1_6S$2oO|!
zynPOWS{@%6p=h{FD4HWc(SSeMFciIO;NPp({5i3t=@?y4Fklgk5YRDh6R;?s9c06@
zsmN_V(TJ8Y@e~7==<iN7V1-^NV4fA9W)_xfO99KZLcnqzB%sSYB|yV`1D}7lz{r2C
z`;LIBEE7<buLM+Ot$?a*5>S<`0;=+ZfU5i|pen_udkyrTREDxNERYAvk`qvszY3_z
zbpom~QGlX{4E&3OI|e8D@h=X(7a-`$A!b3)jYE?CCsl@`2{NH*k^n{b3Q+W*07Wwe
zRAs$@szhho2O;Pc0fJTt5EShYp{UC_b`y#!4g8yfKMGKEg8)Sj2~hN?06~id2-+a<
zt>7=o=VT)k)re3uL_m$s6;PrJ1Sq;#fTFPi6kRPq(2W8FZ7}eET%!NbLI|8cawxhq
zCICfmots4GPk~DWC|WK+(JBFo)(KcRdk!}T2s%}OpuqwJ4Fd}MPb!C^kutGz<_TCi
z%LMFt-wAknXmDQgL3vt1I{~dAC7=}?FQ65iEua<L9EsSVrwC{T^An)=r(AGR{6Rd$
zXIw*ra=ruqK)`q4`;JbAmGiatSONDO_}9eJgD;@FTx^hvGH$Mjuf0DP@GW}%OKlwP
z&K2P97J~}h?GW%Kdauipdn)iYM8KEmmkM}sFgJlHtl*3Dmu2EO{+57W0xS{mOMvA9
zehJWEjC~NoQv$+1PC(fA2nf5u<;gvL2)mt!!uh8UagURUxbG4WchOk8iMaO{5O$e>
zNT&#hwCfdi50PdC)N9{bvk>;DwUH5V?|r2KarYAt_tgfK#C_XU$*@Yo-uG$)!ah<!
z*w+g9F~ST18ny~@ynm~_#ylWmi~tcE1O)fJK^5-mU7Orfg}c236t9~AZ|4fg!gv8$
zc+nuLA`M>|RUy32b&2n4w6+i+?{I?}f_py!o*hWm_3=F^|1*x<4F=qEm4KAY5};w@
zjeeNlf6|CJ<z~Cd*L9o$ik1ja)OoyF2;n0E^0o<(*JXkYL*1bQ(m2(i3<sY~(Efvm
zk+&o_<@nSG1bEmkz(cEBZ5YYwCSaEIHOP~a69lB>d;uxBRX|FjM?~c0EdeQ6DIg_3
zCqOr%5dR<q_SwQah5iQqox*tnn))pQn));WP5n86|NX&c5nVlVcjCL8uKxTz25eJ{
z1a$RJ1a$Q;1a$TN?zMY(9NH$JsrR|hENoL(#6bPa>FUd5qN`sxB^l>mFdQ}2fUf?A
zfUdq#fTEiFZ5V=v2@v$8070t-2>J!!`v>ya14X6N%ma!J6QHO{z&3S+fQ@&6fNg63
z2h0J29v2|!O9TIYA@^W1tO7yTL?RT;6tGXdC_vGh0=B8`0=B85hs+%tZ!-Z;tnCCm
z8+8%zY&1a7hu<GuC89<T2~hO107aVwC_3Tc<Wv3Ih9LqJy)Hn|2Lc2gFx~E9<L#C}
zRCx8!S0)r4D?ri70u(J0py;9*=FUIu37B+OJZcsMWgjy@&^ZDGP4vM0=j{iImYK=F
zhxl@4a#P_w#4H08-625H>jD&gEuci*AGdoDbgckEa|8(b>T$pS_z)^lbm(jY6b*dB
z07Z)gOu7#QDEeH$)7~xtPkZg2OdR-k7Y_*N3#$eG_XoqDvT-b<+BpU&x=nzHhXjat
zQ9#)Bp0;}kyPJTp2MUOEjDXzVZ4gzF`^Sx{nLrB!q<e*c;95VEd{8wjVt{}(euIED
zzCgel-!5Q@*PCk&Sk=u6K>rD=S=Jq7BEts=XjI(=WH@6`LsBaRB=r~p&Gs|_VUG|H
zb|fI|$LIR}$Ctl`xZjhBxSP#OLaib0-U8A+Nq~rT&)P6FTs_|a4U+|ED1Ol_Xy_qe
zmPEZ0D!k*U5TK}9K&VFw2<{jG?oJcn?rH=7w&4x|-X0c^pVlwM@uYbE<@Ycm5_E!q
zPaP*9KQjb`uv|cXHVJ6mKM2TA!v*$1<fpBG{Pc~1^G}Kdjh6{U2fl1Kp=gGIf7@`u
zD~ZLwZP@mz0TZ?SH3Ry>$pTi<_Y2KJUpQrv0ZVGp;$;6xrCC!0-ZB%7VYPsYk9^xK
zEU;Pu3v7;nPS^e&8^&sTNPwVu0tCHo;NLtfjzrXGnSdIt6i}j#0!p++K#8^sDA7&<
zC35d3@nk4beE}tED)7I*ZYiQhhYP4tt$-3u5TIy^07bJ6SV``>CCR7yR}U`=5Ol;+
zvmj_#0#V`B!v!*-=n?^nA_0o76QF3EL7w7$C&1EaS@J=7wDuHGyyrhL3&lI*Q=kDc
zr~Fq?civjnCMx;N?8r(R_y@b=1jvd6$m;%ia!)z3&K6Lo=>k-JBtTW4FYF#vZ52cW
z-{MO%5qxg}Yw1b>b($$4_WhUJJ=EzD0d*=`VHN~UHt2z%+{(n#13~Y{z+&uyqO~%i
zXr};0dwyj%p{TO}MTZGcG*Ez`VFCoz3J^3=fS|{K!oy&y2Z~n7grc#l>{C&+M1Z2k
zs}oBFijEebXs`f5z1G?=1l=S+(AVqCf}oDkdLv&W0g5gapy)#Zik1sdw9f`}fTHUK
zG>29j%|dhN^t}OF@hgIwu6&jLLt^TKqI(4>S}Z_O<J(@WX%jv1qYWndMFN6vu-z;K
z-&H{HR|yEd-3}W@@LvfCe)&&kp&Fn6Y(O<u?=*-g$J4(UQI4u#6R0Hk(p?4wKhTvF
zHriAr!A})Xj#mVf<5K~GHVP0_9GC+H^^Ae(T8W}#WkS&~0n7bT0n2^7fO0%3pd9ZD
zD98Cl_CW|5W#FITCJGSr4<MedRVbP)6N>H=py>Vtc*fu?)iCy5c#Czsfq#ot+9<J<
zbKE^&zzKJufD`T+jgw*iEmr@ii4jNKw*?$=Hwic}ztz-+;ciGX1KdqA@NcmiHcu=S
zc)M7Dw;2Ks%nJlr-kog{aYo)D-~eBD4|B(BgXRKG{cQyt`uhsV!c_vYFjIhrcLit&
z_KaQg?##a%N{Bzhn{g8bh}b4T#4Z6MDq1AL_2JOpPr#vnumC~l3lMaP06}X!#Ag>2
z-Q3dLp=hE2Me|#k1x2-c8=z>e07WYW2->T4GR(j1YSYF5K{EviTFQ2noLx}VtgQix
z$^<AHEkMyi0gAQ=P;|gP<^VzG2@uq$ommj{yr7DAXN!#dOR-M`e9*T7KB%aD;-L!P
z{RH?PA;9-U0r{CDAU{h5<Y$vXR83BH8dZ~%4!=u2$iE@GHi5z$vOjc)ErmB^kChs5
zPvedTq%kc((EFXtLK;u|y#ealclJ<tcZR%~1@bS_$m6kHY#bph6QK1Q0a{ykwP8$*
zn*|8p@4&>8$My9B9NgZ`EI8=dy(B)nq$==mTskpT;9+nt15#IfSOS%J*h_$ilmG_<
z1vnTcz(Jedu>(3-#=TktWRss#MjwiJwEm>8nP}Ii^)sMB-*|)p4SI@!Z-@(H;2jkG
zb%TKZnmV#@4;I>MrGWN&qQJj9yFkQ_@$^x46Cw0E#(*88zkqm75)jX40=B??2gLWJ
zs_^!>fU`oy@n*r>@RJL`{!@j!fv1}ZcU5N?;O?+94cJl3&oW>~O%FC;M?GSQ0UPS6
zXB)8poNZ7|e$Ew;pH~6?>>^35CP7PNB0=i}<Y$KfMUBo$eEZ)U<OL`?Mu4CZ0t7_@
z1l=P*&<ndwDC+$e^Npff0g5IHP}F8<GRz;~Cks&2ZkSon&{=?nqXcO9lOV_0<z5jY
z)(Q~O@LY3;h_(VmbP^!q{t-3|4V^ABKtoP|hC>8sI6MLWXD2wOC**$(=Z+9imF<_s
z?s!AbZyv@Npy+G?iiQcO$_)YpO&1{OH35Pad+>jDJ{_XyU71kys{loNUv8g@qT>W8
z8X-W@7z6*>;4J}ymJ1NH{EFCH;bCS)t>1tA46NdBdKh)BOnG<V^|J6F@Hbg9u4J4C
zPQHG@cNOqKqXc}=H3Bksw}8w&De%8t`(eDfBXw8YYC!645|Fyd0#euRHXBCf1}9Kh
z@EZmEfrcyYjEAMFd?D^Lz}tjr2}D&Sb@~HlBB}EqG$5(38TiHfrU0!SA4-P#wVM&3
zwOWAIKMR;8Lj_2^qX4|SN%<cO&6J7g-Vvbn3jtbx7BEX%KWrf|OYRaN=raL=z7rtm
zqUp&!e(nA^-S0n?GF5}3i)WY#5myTk@vs09PY4jPLx6^gN6Y~lh6vCwT7ZVJ0yIRw
z%(9yhG4?3~MBE}k#6$ri?oObvcBcr?@SuRI9QR!8t*~~d2@v$Mfc57VicqvlfTB9j
zn+Fti5TIy30gAc^P&7n<hN%KHydXfsn=$Zb_xyToGe7yD6e125AmZQ`%|caLz7_+E
zH|KUN^gze*>#+Un1~?cZz`?}=9E=l?g$Dt@|KNcvY*=I-$ifAS4amY+0a+L?APddj
zvSDQ5&k4{=Qf|Y0u?0xGF&_!|3l%>xz;$`F!U*4`s}1noe2oFV8?H4V!^P_im@>Z#
zNO!9ZW+B~OzcwJ<X#>BI^8)_vST|lowx$Zm)>8tqwNOB^mI+8!oo|v4@(Xz%0fG(@
zAm~T|f`%p#rTm-o8)ZUKqmAYcMMnuxbfy4BYYhBKUjJ=!k6*}t*<^sA*8~W9Ux1*0
zd0_shQZ*?0RVEbGY&H)l8Ye)}lL8dIB0$k%0fLVBmpMSt;_U_q`ci<PRomnJhY(P-
zJ~0)R^|t~PZ55zs%C6X5VOehxps1;<S6C7J*>&D?2@u5h7KsHx0|e#%yBiUTMhQ^#
zR{@Hi6rkuW0gCDc<{L%(3J}!Yz%TJgfS}t9BLBO=+v+49QivE_HwIP?f6rKh7+COG
z_iG~oyKqwt%k!5F$dYnXS_;x`dMiQR&2C-K^*_3*`UKahO+8om=jzsju5Udk;NK$t
zt;4^?b6XFpyI^d;pr}r<t6S30HR7*ba7~*v-($}fEuGuDb*JC&yWjo?bnepiz=IC%
z)}23-#jiukczkHqr?+c#!Q-yU^Y^)uXI?5?`R}>Qmew75V9<JQMN!F_{3V6OZtvRQ
z(xzM{1eZB3Q-d-7^2FR1N=iBhy_yxfwx<UV`^(5+dUGzd!3=+y5Io{9Q-VkRWp?lw
zceQ;vn2E=>9|W^Jt(<goRmt`Bxwl<u@M^P3Pt-5jrv;<ijSSxKm)hV>Mz@<V>4W+u
z(WFxwl(fomTe}Z}cl~8$@SeAB3Epo~?Ap8F1E_uT;Gh0d8hq$4VepZ^96on)gOVm$
zL_KoYe=TZSEb6KMCsD7)qCSj8t@^(ZHDc0?>XPP1E%tJz1#kJwQ^DK*@@nvozkC==
zUG?9WIti(jbNkhl>{H%+iL2|{4+xgl=W<4{%uTxTijsYr1<>r^bAMS7e9>Ui2RE0r
zOhdnO!AgH=9(>h=OKGsmU&3IuzZ@Q{@s|O?+NNAi57srA^xYLDEhB%!l;9hGnH_BO
zLly+zHsbPru*uVkU^7AdZcDI*O9vNx*N{u|U>i4d2!nt5%i*q;OMMr7?`c5r1NU_}
zJ^0aIM!GAx)NdYa_qJMhl^<E^uJ#w6S%XQF|5noR#9zGeeRq@pzf;_e{xTuh;qRXi
z{NyiFf}j0mcCgc576iZg8&(9n{AEj#<5KF10)J^<RMePDX;B?UmWGpdMI{GS`Tv|y
z)X-n16gBe0W*0T~mjy*l{QrEvsHvwFMLxHsTZ)=<>FA2~@R#OAdorYB>D)7FOYSKC
zPbE3$x03u@OEM`OP_ozD2G^I={^z=!^;=#3t#z4u*}{@j>&{(sYsph#PkLAw_pq@2
z*%SsE8GIaYsik>wc|Z8l(~4lZzibIsa4EF1Nh@BZK{bI2%`1$XS6FCX{LhiWdOxx@
z*x)Y{g0KCh(8|KNm4$ID3*%N6#;q)jTUi*lvM_FCVcg2XxRr%*D+>#)tWDi8?qy-z
z%fh&qg&k@qUGZ8;+PAJSZe3yAy27}1g>mZ&<JJ|%^$6qE6~?VAj9XV2x2`a5U18k1
zLRwerg@x7?#;q%iTUSWyqGyG1&kEz76~;X)jC)oX_pGpEX;BNJ>li*vJ*t|w4C)3Q
z5BHl%(0+(tAyXRF+vh<3XS|sNh0O#i)FX)N5ybTf;(FBXS+8ZQCUt|j9zk4>Al^)x
zH?HS5lOV1@5LY0GD-gsL2;vF^aRq|70s$4+iq8(EeoqPFLIiOkg18Vtyr%?l9fG(H
zL0pF*-cy3Yo-!%FSG~@@B0*e{Ag)LdS0sol62uh=;)(=uMS{2@L0pj_u1FA9B#0{#
zP?48f)H|p>!NwH{;)(?EW)c)OlS$26)oZyw5yYhk;!*@1OWhGg|7!sXE$X)d_`(-<
z^Z&mEVA}s51&B9`=)ID$#V!7~ViX>&ek;cRP%-`+tKrPw+R?wa9TlEre_H|nLo49F
fY)7fq^+q+nD4psuyiMuDk6nD(^fh;0e!zbK%u;FF

delta 27026
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

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index e97b7a1b2d4..7516916f675 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -108,10 +108,6 @@ private:
 	Screen_Eob *_screen;
 };
 
-bool EobCoreEngine::startCharacterGeneration() {
-	return CharacterGenerator(this, _screen).start(_characters, &_faceShapes);
-}
-
 CharacterGenerator::CharacterGenerator(EobCoreEngine *vm, Screen_Eob *screen) : _vm(vm), _screen(screen),
 	_characters(0), _faceShapes(0), _chargenMagicShapes(0), _chargenButtonLabels(0), _chargenMagicShapeTimer(0),
 	_updateBoxShapesIndex(0), _lastUpdateBoxShapesIndex(0), _magicShapesBox(6), _activeBox(0) {
@@ -1445,6 +1441,15 @@ const int16 CharacterGenerator::_raceModifiers[] = {
 	0, 0, 0, 0,	1, -1, 0, 1, -1, 0, 0, 0, -1, 0, 0, 1, 0, 0
 };
 
+bool EobCoreEngine::startCharacterGeneration() {
+	return CharacterGenerator(this, _screen).start(_characters, &_faceShapes);
+}
+
+bool EobCoreEngine::transferParty() {
+
+	return false;
+}
+
 }	// End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index 71644c5a873..8ce41d6b5b5 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -78,8 +78,8 @@ Common::Error EobEngine::init() {
 
 	_scriptTimersCount = 1;
 
-	_wllWallFlags[132] = 1;
-	_wllWallFlags[133] = 1;
+	//_wllWallFlags[132] = 1;
+	//_wllWallFlags[133] = 1;
 
 	return Common::kNoError;
 }
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index c94cb16703c..3a298d84ad4 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -40,14 +40,16 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_teleporterWallId(flags.gameID == GI_EOB1 ? 52 : 44) {
 	_screen = 0;
 	_gui = 0;
-	//_processingButtons=false;
-	//_runLoopUnk2 = 0;
-	//_runLoopTimerUnk = 0;
+
 	_playFinale = false;
 	_runFlag = true;
 	_configMouse = true;
 	_loading = false;
 
+	_envAudioTimer = 0;
+	_flashShapeTimer = 0;
+	_drawSceneTimer = 0;
+
 	_largeItemShapes = _smallItemShapes = _thrownItemShapes = _spellShapes = _firebeamShapes = _itemIconShapes =
 		_wallOfForceShapes = _teleporterShapes = _sparkShapes = _compassShapes = 0;
 	_redSplatShape = _greenSplatShape = _deadCharShape = _disabledCharGrid = _blackBoxSmallGrid =
@@ -60,6 +62,9 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_beholderSpellList = 0;
 	_beholderSfx = 0;
 
+	_transferConvertTable = 0;
+	_transferExpTable = 0;
+
 	_faceShapes = 0;
 	_characters = 0;
 	_items = 0;
@@ -297,6 +302,13 @@ Common::Error EobCoreEngine::init() {
 	memset(&_wllShapeMap[3], -1, 5);
 	memset(&_wllShapeMap[13], -1, 5);
 
+	/*int clen = _flags.gameID == GI_EOB2 ? 80 : 70;
+	memcpy(&_wllShapeMap[256 - clen], _wllVmpMap, clen);
+	memcpy(&_specialWallTypes[256 - 2 * clen], _wllVmpMap, clen);
+	memcpy(&_specialWallTypes[256 - clen], _wllShapeMap, clen);
+	memcpy(&_wllWallFlags[256 - 2 * clen], _wllShapeMap, clen);
+	memcpy(&_wllWallFlags[256 - clen], _specialWallTypes, clen);*/
+
 	_wllVcnOffset = 16;
 
 	_monsters = new EobMonsterInPlay[30];
@@ -384,7 +396,9 @@ Common::Error EobCoreEngine::go() {
 				startupNew();
 		} else if (action == -3) {
 			// transfer party
-			repeatLoop = false;
+			repeatLoop = transferParty();
+			if (repeatLoop && !shouldQuit())
+				startupNew();
 		}
 	}
 
@@ -441,15 +455,13 @@ void EobCoreEngine::runLoop() {
 	_envAudioTimer = _system->getMillis() + (rollDice(1, 10, 3) * 18 * _tickLength);	
 	_flashShapeTimer = 0;
 	_drawSceneTimer = _system->getMillis();
-	//__unkB__ = 1;
+
 	_screen->setFont(Screen::FID_6_FNT);
 	_screen->setScreenDim(7);
 
-	//_runLoopUnk2 = _currentBlock;
 	_runFlag = true;
 
 	while (!shouldQuit() && _runFlag) {
-		//_runLoopUnk2 = _currentBlock;
 		checkPartyStatus(true);
 		checkInput(_activeButtons, true, 0);
 		removeInputTop();
@@ -723,7 +735,7 @@ int EobCoreEngine::generateCharacterHitpointsByLevel(int charIndex, int levelInd
 
 int EobCoreEngine::getClassAndConstHitpointsModifier(int cclass, int constitution) {
 	int res = _hpConstModifiers[constitution];
-
+	// This also applies to EOB1 despite being coded differently there
 	if (res <= 2 || (_classModifierFlags[cclass] & 0x31))
 		return res;
 
@@ -1176,7 +1188,7 @@ uint32 EobCoreEngine::getRequiredExperience(int cClass, int levelIndex, int leve
 
 void EobCoreEngine::increaseCharacterLevel(int charIndex, int levelIndex) {
 	_characters[charIndex].level[levelIndex]++;
-	int hpInc = generateCharacterHitpointsByLevel(charIndex, levelIndex);
+	int hpInc = generateCharacterHitpointsByLevel(charIndex, 1 << levelIndex);
 	_characters[charIndex].hitPointsCur += hpInc;
 	_characters[charIndex].hitPointsMax += hpInc;
 
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index ffc951e80da..5f1bf8b7099 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -317,8 +317,9 @@ protected:
 	bool _runFlag;
 	//int _runLoopUnk2;
 
-	// Create Party
+	// Character generation / party transfer
 	bool startCharacterGeneration();
+	bool transferParty();
 
 	uint8 **_faceShapes;
 
@@ -329,6 +330,9 @@ protected:
 	static const uint8 _charClassModUnk[];
 
 	const uint8 *_classModifierFlags;
+	
+	const uint8 *_transferConvertTable;
+	const uint32 *_transferExpTable;
 
 	// timers
 	void setupTimers();
@@ -509,7 +513,7 @@ protected:
 
 	void updateMonsters(int unit);
 	void updateMonsterDest(EobMonsterInPlay *m);
-	void updateMonsterDest2(EobMonsterInPlay *m);
+	void updateMonsterAttackMode(EobMonsterInPlay *m);
 	void updateAllMonsterDests();
 	void turnFriendlyMonstersHostile();
 	int getNextMonsterDirection(int curBlock, int destBlock);
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 7778feba8e7..a5f06c551e7 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -1978,8 +1978,6 @@ int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 	if (!result)
 		result = inputFlags;
 	
-	//_vm->_processingButtons=false;
-
 	return result;
 }
 
@@ -2773,7 +2771,6 @@ int GUI_Eob::selectSaveSlotDialogue(int x, int y, int id) {
 			
 			// Display highlighted slot index in the bottom left corner to avoid people getting lost with the 990 save slots
 			_screen->setFont(Screen::FID_6_FNT);
-			_screen->fillRect(_saveSlotX + 5, _saveSlotY + 135, _saveSlotX + 46, _saveSlotY + 140, _vm->_bkgColor_1);
 			int sli = (newHighlight == 6) ?  _savegameOffset : (_savegameOffset + newHighlight);
 			_screen->printText(Common::String::format("%03d/989", sli).c_str(), _saveSlotX + 5, _saveSlotY + 135, _vm->_color2_1, _vm->_bkgColor_1);
 			_screen->setFont(Screen::FID_8_FNT);
@@ -3980,6 +3977,7 @@ void GUI_Eob::releaseButtons(Button *list) {
 		delete list;
 		list = n;
 	}
+	_vm->gui_notifyButtonListChanged();
 }
 
 void GUI_Eob::setupSaveMenuSlots() {
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 4fc78c0b643..030b1dec7a5 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -1163,6 +1163,7 @@ void LoLEngine::setCharacterUpdateEvent(int charNum, int updateType, int updateD
 		l->characterUpdateEvents[i] = updateType;
 		l->characterUpdateDelay[i] = updateDelay;
 		_timer->setNextRun(3, _system->getMillis());
+		_timer->resetNextRun();
 		_timer->enable(3);
 		break;
 	}
diff --git a/engines/kyra/loleobbase.cpp b/engines/kyra/loleobbase.cpp
index 2ffae915b17..c2ec8da706a 100644
--- a/engines/kyra/loleobbase.cpp
+++ b/engines/kyra/loleobbase.cpp
@@ -164,14 +164,14 @@ Common::Error LolEobBaseEngine::init() {
 	_levelBlockProperties = new LevelBlockProperty[1025];
 	memset(_levelBlockProperties, 0, 1025 * sizeof(LevelBlockProperty));
 
-	_wllVmpMap = new uint8[255];
-	memset(_wllVmpMap, 0, 255);
-	_wllShapeMap = new int8[255];
-	memset(_wllShapeMap, 0, 255);
-	_specialWallTypes = new uint8[255];
-	memset(_specialWallTypes, 0, 255);
-	_wllWallFlags = new uint8[255];
-	memset(_wllWallFlags, 0, 255);
+	_wllVmpMap = new uint8[256];
+	memset(_wllVmpMap, 0, 256);
+	_wllShapeMap = new int8[256];
+	memset(_wllShapeMap, 0, 256);
+	_specialWallTypes = new uint8[256];
+	memset(_specialWallTypes, 0, 256);
+	_wllWallFlags = new uint8[256];
+	memset(_wllWallFlags, 0, 256);
 
 	_blockDrawingBuffer = new uint16[1320];
 	memset(_blockDrawingBuffer, 0, 1320 * sizeof(uint16));
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index f330d42004a..cd3865736f5 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -537,6 +537,9 @@ enum KyraResources {
 	kEob1Npc7Strings,
 
 	kEob2MainMenuStrings,
+	kEob2TransferConvertTable,
+	kEob2TransferExpTable,
+
 	kEob2IntroStrings,
 	kEob2IntroCPSFiles,
 	kEob2IntroSeqData00,
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index afce9efdfa0..1bd7fca04ab 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -1012,8 +1012,8 @@ void EobCoreEngine::drawScene(int refresh) {
 	}
 
 	if (_sceneDefaultUpdate) {
-		resetSkipFlag();
 		delayUntil(_drawSceneTimer);
+		removeInputTop();
 	}
 
 	if (refresh && !_partyResting)
@@ -1029,7 +1029,7 @@ void EobCoreEngine::drawScene(int refresh) {
 
 	if (_sceneDefaultUpdate) {
 		_sceneDefaultUpdate = false;
-		_drawSceneTimer = _system->getMillis() /*+ 4 * _tickLength*/;
+		_drawSceneTimer = _system->getMillis() + 4 * _tickLength;
 	}
 
 	_sceneUpdateRequired = false;
@@ -1141,8 +1141,8 @@ int EobCoreEngine::calcNewBlockPositionAndTestPassability(uint16 curBlock, uint1
 	int w = _levelBlockProperties[b].walls[direction ^ 2];
 	int f = _wllWallFlags[w];
 
-	if (!f)
-		assert((_flags.gameID == GI_EOB1 && w < 70) || (_flags.gameID == GI_EOB2 && w < 80));
+	//if (!f)
+	assert((_flags.gameID == GI_EOB1 && w < 70) || (_flags.gameID == GI_EOB2 && w < 80));
 
 	if (_flags.gameID == GI_EOB2 && w == 74 && _currentBlock == curBlock) {
 		for (int i = 0; i < 5; i++) {
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index c9ee9119db7..d29af69f0a1 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -151,9 +151,6 @@ void Screen_Eob::loadShapeSetBitmap(const char *file, int tempPage, int destPage
 }
 
 void Screen_Eob::loadEobBitmap(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage) {
-	//Common::String tmp = file;
-	//if (_vm->game() == GI_EOB1 && tmp.equalsIgnoreCase("spider"))
-	//	tmp += "1";
 	Common::String tmp = Common::String::format("%s.CPS", file);
 	Common::SeekableReadStream *s = _vm->resource()->createReadStream(tmp);
 	bool loadAlternative = false;
@@ -170,15 +167,20 @@ void Screen_Eob::loadEobBitmap(const char *file, const uint8 *ditheringData, int
 	}
 
 	if (loadAlternative) {
-		tmp.setChar('X', 0);
-		s = _vm->resource()->createReadStream(tmp);
-		if (!s)
-			error("Screen_Eob::loadEobBitmap(): CPS file loading failed.");
-		s->seek(768);
-		loadFileDataToPage(s, destPage, 64000);
-		delete s;
+		if (_vm->game() == GI_EOB1) {
+			tmp.insertChar('1', tmp.size() - 4);
+			loadBitmap(tmp.c_str(), tempPage, destPage, 0);
+		} else {
+			tmp.setChar('X', 0);
+			s = _vm->resource()->createReadStream(tmp);
+			if (!s)
+				error("Screen_Eob::loadEobBitmap(): CPS file loading failed.");
+			s->seek(768);
+			loadFileDataToPage(s, destPage, 64000);
+			delete s;
+		}
 	}
-
+	
 	if (copyToPage == -1) {
 		return;
 	} else if (copyToPage == 0) {
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index caf4a748da4..bd5ab27eadf 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -53,12 +53,8 @@ int LolEobBaseEngine::getBlockDistance(uint16 block1, uint16 block2) {
 
 namespace Kyra {
 
-void EobCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex) {
-	Common::String s = filename;
-	if ((_flags.gameID == GI_EOB1) && (!scumm_stricmp(filename, "rust") || !scumm_stricmp(filename, "drider") || !scumm_stricmp(filename, "spider") || !scumm_stricmp(filename, "mantis") || !scumm_stricmp(filename, "xorn") || !scumm_stricmp(filename, "xanath")))
-		s += "1";
-
-	_screen->loadShapeSetBitmap(s.c_str(), 3, 3);
+void EobCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex) {	
+	_screen->loadShapeSetBitmap(filename, 3, 3);
 	const uint16 *enc = &_encodeMonsterShpTable[encodeTableIndex << 2];
 
 	for (int i = 0; i < 6; i++, enc += 4)
@@ -149,6 +145,7 @@ const uint8 *EobCoreEngine::loadActiveMonsterData(const uint8 *data, int level)
 		int32 del = _timer->getDelay(i);
 		_timer->setNextRun(i, (i & 1) ? ct + (del >> 1) * _tickLength : ct + del * _tickLength);
 	}
+	_timer->resetNextRun();
 
 	if (_hasTempDataFlags & (1 << (level - 1)))
 		return data + 420;
@@ -470,6 +467,12 @@ void EobCoreEngine::drawBlockItems(int index) {
 
 void EobCoreEngine::drawDoor(int index) {
 	int s = _visibleBlocks[index]->walls[_sceneDrawVarDown];
+
+	if (_flags.gameID == GI_EOB1 && s == 0x85)
+		s = 0;
+
+	assert((_flags.gameID == GI_EOB1 && s < 32) || (_flags.gameID == GI_EOB2 && s < 53));
+
 	int type = _dscDoorShpIndex[s];
 	int d = _dscDimMap[index];
 	int w = _dscShapeCoords[(index * 5 + 4) << 1];
@@ -722,7 +725,7 @@ void EobCoreEngine::updateMonsters(int unit) {
 			updateMonsterDest(m);
 
 			if (m->mode > 0)
-				updateMonsterDest2(m);
+				updateMonsterAttackMode(m);
 
 			switch (m->mode) {
 			case 0:
@@ -780,7 +783,7 @@ void EobCoreEngine::updateMonsterDest(EobMonsterInPlay *m) {
 	m->dest = _currentBlock;
 }
 
-void EobCoreEngine::updateMonsterDest2(EobMonsterInPlay *m) {
+void EobCoreEngine::updateMonsterAttackMode(EobMonsterInPlay *m) {
 	if (!(m->flags & 1) || m->mode == 10)
 		return;
 	if (m->mode == 8) {
@@ -902,7 +905,7 @@ void EobCoreEngine::updateMoveMonster(EobMonsterInPlay *m) {
 	EobMonsterProperty *p = &_monsterProps[m->type];
 	int d = getNextMonsterDirection(m->block, _currentBlock);
 
-	if ((p->capsFlags & 0x800) && !(d & 1))
+	if ((_flags.gameID == GI_EOB2) && (p->capsFlags & 0x800) && !(d & 1))
 		d >>= 1;
 	else
 		d = m->dir;
@@ -1102,31 +1105,34 @@ void EobCoreEngine::walkMonster(EobMonsterInPlay *m, int destBlock) {
 		return;
 
 	if (m->flags & 8) {
+		// Interestingly, the fear spell in EOB 1 does not expire.
+		// I don't know whether this is intended or not.
 		if (_flags.gameID == GI_EOB1 ) {
 			d ^= 4;
-		} else if (--m->spellStatusLeft <= 0) {
-			m->spellStatusLeft = 0;
-			m->flags &= ~8;
-		} else {
-			d ^= 4;
+		} else if (m->spellStatusLeft > 0) {
+			if (--m->spellStatusLeft == 0)
+				m->flags &= ~8;
+			else
+				d ^= 4;
 		}
 	}
 
 	int d2 = (d - s) & 7;
 
-	if (b + _monsterStepTable0[_flags.gameID == GI_EOB1 ? (d >> 1) : d] == destBlock) {
-		if (_flags.gameID == GI_EOB1 && !(d & 1)) {
-			if (d2 >= 5) {
+	if (_flags.gameID == GI_EOB1) {
+		if ((b + _monsterStepTable0[d >> 1] == _currentBlock) && !(d & 1)) {
+			if (d2 >= 5)
 				s = m->dir - 1;
-			} else if (d2 != 0) {
+			else if (d2 != 0)
 				s = m->dir + 1;
-			}
 			walkMonsterNextStep(m, -1, s & 3);
 			return;
-		} else if (_flags.gameID == GI_EOB2) {
+		}
+	} else if (_flags.gameID == GI_EOB2) {
+		if (b + _monsterStepTable0[d] == destBlock) {
 			if (d & 1) {
 				int e = _monsterStepTable1[((d - 1) << 1) + m->dir];
-				if (e && !((_monsterProps[m->type].capsFlags & 0x200) && (rollDice(1, 4) == 4))) {
+				if (e && (!(_monsterProps[m->type].capsFlags & 0x200) || (rollDice(1, 4) < 4))) {
 					if (walkMonsterNextStep(m, b + e, -1))
 						return;
 				}
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 069bf1337d1..57ee737ba04 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -1241,6 +1241,9 @@ void EobEngine::initSpells() {
 void DarkMoonEngine::initStaticResource() {
 	int temp;
 	_mainMenuStrings = _staticres->loadStrings(kEob2MainMenuStrings, temp);
+	_transferConvertTable = _staticres->loadRawData(kEob2TransferConvertTable, temp);
+	_transferExpTable = _staticres->loadRawDataBe32(kEob2TransferExpTable, temp);
+
 	_introStrings = _staticres->loadStrings(kEob2IntroStrings, temp);
 	_cpsFilesIntro = _staticres->loadStrings(kEob2IntroCPSFiles, temp);
 
diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp
index 2ab2b621f33..95c283f0639 100644
--- a/engines/kyra/timer.cpp
+++ b/engines/kyra/timer.cpp
@@ -149,6 +149,8 @@ void TimerManager::setCountdown(uint8 id, int32 countdown) {
 			uint32 curTime = _system->getMillis();
 			timer->lastUpdate = curTime;
 			timer->nextRun = curTime + countdown * _vm->tickLength();
+			if (timer->enabled & 2)
+				timer->pauseStartTime = curTime;
 
 			_nextRun = MIN(_nextRun, timer->nextRun);
 		}
@@ -177,6 +179,8 @@ int32 TimerManager::getDelay(uint8 id) const {
 void TimerManager::setNextRun(uint8 id, uint32 nextRun) {
 	Iterator timer = Common::find_if(_timers.begin(), _timers.end(), TimerEqual(id));
 	if (timer != _timers.end()) {
+		if (timer->enabled & 2)
+			timer->pauseStartTime = _system->getMillis();
 		timer->nextRun = nextRun;
 		return;
 	}
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index 61fa554193b..caeae8cb29a 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -115,6 +115,7 @@ void EobCoreEngine::setupTimers() {
 	_timer->addTimer(5, TimerV2(timerUpdateTeleporters), 10, true);
 	_timer->addTimer(6, TimerV2(timerUpdateFoodStatus), 1080, true);
 	_timer->addTimer(7, TimerV2(timerUpdateMonsterIdleAnim), 25, true);
+	_timer->resetNextRun();
 }
 
 void EobCoreEngine::setCharEventTimer(int charIndex, uint32 countdown, int evnt, int updateExistingTimer) {
@@ -132,6 +133,7 @@ void EobCoreEngine::setCharEventTimer(int charIndex, uint32 countdown, int evnt,
 
 	if (ntime < _timer->getNextRun(timerId))
 		_timer->setNextRun(timerId, ntime);
+	_timer->resetNextRun();
 
 	if (updateExistingTimer) {
 		bool updated = false;
@@ -194,6 +196,7 @@ void EobCoreEngine::setupCharacterTimers() {
 			_timer->setCountdown(0x30 | i, (nextTimer - ctime) / _tickLength);
 		}
 	}
+	_timer->resetNextRun();
 }
 
 void EobCoreEngine::advanceTimers(uint32 millis) {
diff --git a/engines/kyra/timer_lol.cpp b/engines/kyra/timer_lol.cpp
index 5a6677a4f67..d0b4062a65e 100644
--- a/engines/kyra/timer_lol.cpp
+++ b/engines/kyra/timer_lol.cpp
@@ -45,6 +45,7 @@ void LoLEngine::setupTimers() {
 	_timer->addTimer(9, TimerV2(timerUpdatePortraitAnimations), 10, true);
 	_timer->addTimer(10, TimerV2(timerUpdateLampState), 360, true);
 	_timer->addTimer(11, TimerV2(timerFadeMessageText), 360, false);
+	_timer->resetNextRun();
 }
 
 void LoLEngine::timerProcessMonsters(int timerNum) {