diff -ur -x '*.log' -x '*.diff' -x '*.zip*' -x '*.tar.gz*' -x '*.tar.xz*' -x RELEASE -x PACKAGES -x '*REBUILD*' -x .release -x rpmlist /home/openttd/public_html/friss/nightlies/r43/FRISS.md5 /home/openttd/public_html/friss/nightlies/REBUILD/r43/FRISS.md5
--- /home/openttd/public_html/friss/nightlies/r43/FRISS.md5	
+++ /home/openttd/public_html/friss/nightlies/REBUILD/r43/FRISS.md5	
@@ -1 +1 @@
-fbcdd8cf542f99071b5db0d8cf3db0ac  FRISS.grf
+a1a88dbae7e74ac2b9b0bc0901308b3a  FRISS.grf
Only in /home/openttd/public_html/friss/nightlies/r43: grf2html
diff -ur -x '*.log' -x '*.diff' -x '*.zip*' -x '*.tar.gz*' -x '*.tar.xz*' -x RELEASE -x PACKAGES -x '*REBUILD*' -x .release -x rpmlist /home/openttd/public_html/friss/nightlies/r43/log/friss.nfo /home/openttd/public_html/friss/nightlies/REBUILD/r43/log/friss.nfo
--- /home/openttd/public_html/friss/nightlies/r43/log/friss.nfo	
+++ /home/openttd/public_html/friss/nightlies/REBUILD/r43/log/friss.nfo	
@@ -38,44 +38,44 @@
 
 5 * 3145 04 0F B5 62 \wxD000 "Suomalaiset asemarakennukset" 00 "Iisalmi (asfalttipohja)" 00 "Riippa (sorapohja)" 00 "Riippa (hiekkapohja)" 00 "Riippa (asfalttipohja)" 00 "Riippa (mutapohja)" 00 "Kokkola (asfalttipohja)" 00 "Sukeva (sorapohja)" 00 "Sukeva (hiekkapohja)" 00 "Sukeva (asfalttipohja)" 00 "Sukeva (mutapohja)" 00 "ÞKauppilanmäki (sorapohja)" 00 "ÞKauppilanmäki (hiekkapohja)" 00 "ÞKauppilanmäki (asfalttipohja)" 00 "ÞKauppilanmäki (mutapohja)" 00 "Platformskjul III-tyypin seisakerakennus (sorapohja)" 00 "Platformskjul III-tyypin seisakerakennus (hiekkapohja)" 00 "Platformskjul III-tyypin seisakerakennus (asfalttipohja)" 00 "Platformskjul III-tyypin seisakerakennus (mutapohja)" 00 "Suomalaiset tavara-asemarakennukset" 00 "Sukeva tavarasuojarakennus (sorapohja)" 00 "Sukeva tavarasuojarakennus (hiekkapohja)" 00 "Sukeva tavarasuojarakennus (asfalttipohja)" 00 "Sukeva tavarasuojarakennus (mutapohja)" 00 "ÞKurkimäki tavarasuojarakennus + tavaralaituri (sorapohja)" 00 "ÞKurkimäki tavarasuojarakennus + tavaralaituri (hiekkapohja)" 00 "ÞKurkimäki tavarasuojarakennus + tavaralaituri (asfalttipohja)" 00 "ÞKurkimäki tavarasuojarakennus + tavaralaituri (mutapohja)" 00 "Suomalaiset asetinlaiterakennukset" 00 "Airaksela/Iloharju (sorapohja)" 00 "Airaksela/Iloharju (hiekkapohja)" 00 "Airaksela/Iloharju (asfalttipohja)" 00 "Airaksela/Iloharju (mutapohja)" 00 "Markkala (sorapohja)" 00 "Markkala (hiekkapohja)" 00 "Markkala (asfalttipohja)" 00 "Markkala (mutapohja)" 00 "Suonenjoki (sorapohja)" 00 "Suonenjoki (hiekkapohja)" 00 "Suonenjoki (asfalttipohja)" 00 "Suonenjoki (mutapohja)" 00 "Taipale (sorapohja)" 00 "Taipale (hiekkapohja)" 00 "Taipale (asfalttipohja)" 00 "Taipale (mutapohja)" 00 "Karhukangas/Matkaneva (sorapohja)" 00 "Karhukangas/Matkaneva (hiekkapohja)" 00 "Karhukangas/Matkaneva (asfalttipohja)" 00 "Karhukangas/Matkaneva (mutapohja)" 00 "ÞSiilinjärvi (sorapohja)" 00 "ÞSiilinjärvi (hiekkapohja)" 00 "ÞSiilinjärvi (asfalttipohja)" 00 "ÞSiilinjärvi (mutapohja)" 00 "Suomalaiset laitekojut, kontit ja kaapit" 00 "Pieni laitekaappi (terrain base)" 00 "Pieni laitekaappi (sorapohja)" 00 "Pieni laitekaappi (hiekkapohja)" 00 "Pieni laitekaappi (asfalttipohja)" 00 "Pieni laitekaappi (mutapohja)" 00 "Keskikokoinen laitekaappi (terrain base)" 00 "Keskikokoinen laitekaappi (sorapohja)" 00 "Keskikokoinen laitekaappi (hiekkapohja)" 00 "Keskikokoinen laitekaappi (asfalttipohja)" 00 "Keskikokoinen laitekaappi (mutapohja)" 00 "Suuri laitekaappi (terrain base)" 00 "Suuri laitekaappi (sorapohja)" 00 "Suuri laitekaappi (hiekkapohja)" 00 "Suuri laitekaappi (asfalttipohja)" 00 "Suuri laitekaappi (mutapohja)" 00 "Keskitetty laitekaappi (terrain base)" 00 "Keskitetty laitekaappi (sorapohja)" 00 "Keskitetty laitekaappi (hiekkapohja)" 00 "Keskitetty laitekaappi (asfalttipohja)" 00 "Keskitetty laitekaappi (mutapohja)" 00 "RHK:n laitekontti (maastopohja)" 00 "RHK:n laitekontti (sorapohja)" 00 "RHK:n laitekontti (hiekkapohja)" 00 "RHK:n laitekontti (asfalttipohja)" 00 "RHK:n laitekontti (mutapohja)" 00 "70-luvun laitekoju (terrain base)" 00 "70-luvun laitekoju (sorapohja)" 00 "70-luvun laitekoju (hiekkapohja)" 00 "70-luvun laitekoju (asfalttipohja)" 00 "70-luvun laitekoju (mutapohja)" 00 "90-luvun laitekoju (terrain base)" 00 "90-luvun laitekoju (sorapohja)" 00 "90-luvun laitekoju (hiekkapohja)" 00 "90-luvun laitekoju (asfalttipohja)" 00 "90-luvun laitekoju (mutapohja)" 00 "Suomalaiset kauko-ohjausrakennukset" 00 "ÞPieksämäki kauko-ohjaustorni (sorapohja)" 00 "ÞPieksämäki kauko-ohjaustorni (asfalttipohja)" 00 "Suomalaiset peruslaatat" 00 "Sora" 00 "Hiekka" 00 "Asfaltti" 00 "Muta" 00 "Betoni" 00 
 
-// param[64] = -1
-6 * 9 0D 40 \D= FF 00 \dxFFFFFFFF 
+// param[127] = -1
+6 * 9 0D 7F \D= FF 00 \dxFFFFFFFF 
 
-// param[65] = param[157]
-7 * 5 0D 41 \D= 9D 00 
+// param[126] = param[157]
+7 * 5 0D 7E \D= 9D 00 
 
-8 * 9 09 41 04 \7= \dx00000001 02 
+8 * 9 09 7E 04 \7= \dx00000001 02 
 
-// param[64] = 0
-9 * 9 0D 40 \D= FF 00 \dx00000000 
+// param[127] = 0
+9 * 9 0D 7F \D= FF 00 \dx00000000 
 
 10 * 12 0B 03 7F 02 "OpenTTD" 00 
 
-11 * 9 09 40 04 \7= \dx00000000 05 
+11 * 9 09 7F 04 \7= \dx00000000 05 
 
-// param[67] = param[161]
-12 * 5 0D 43 \D= A1 00 
+// param[124] = param[161]
+12 * 5 0D 7C \D= A1 00 
 
-// param[66] = (param[67] - 302013730)
-13 * 9 0D 42 \D- 43 FF \dx12005D22 
+// param[125] = (param[124] - 302013730)
+13 * 9 0D 7D \D- 7C FF \dx12005D22 
 
-// param[66] = (param[66] << -31)
-14 * 9 0D 42 \Du<< 42 FF \dxFFFFFFE1 
+// param[125] = (param[125] << -31)
+14 * 9 0D 7D \Du<< 7D FF \dxFFFFFFE1 
 
-15 * 9 09 42 04 \7= \dx00000000 01 
+15 * 9 09 7D 04 \7= \dx00000000 01 
 
 16 * 19 0B 03 7F 06 "1.2.0 / r23842" 00 
 
-// param[64] = (param[0] & 1)
-17 * 9 0D 40 \D& 00 FF \dx00000001 
+// param[127] = (param[0] & 1)
+17 * 9 0D 7F \D& 00 FF \dx00000001 
 
 18 * 7 06 
-40 04 FF \wx0006 
+7F 04 FF \wx0006 
 FF 
 
 // Name: switch_animation_start_Siemens
 19 * 23 02 0F FF 89 
-1A 00 \dx00000000 	// param[64]
+1A 00 \dx00000000 	// param[127]
 \b1 
 \wxC9FE \dx00000001 \dx00000001 	// 1 .. 1: return 18942;
 \wx80FF // default: return 255;
@@ -87,16 +87,16 @@
 \wxCAFE \dx00000001 \dx00000001 	// 1 .. 1: return 19198;
 \wxC9FE // default: return 18942;
 
-// param[64] = (param[0] & 1)
-21 * 9 0D 40 \D& 00 FF \dx00000001 
+// param[127] = (param[0] & 1)
+21 * 9 0D 7F \D& 00 FF \dx00000001 
 
 22 * 7 06 
-40 04 FF \wx0006 
+7F 04 FF \wx0006 
 FF 
 
 // Name: switch_animation_start_Ganz_Fiskars
 23 * 23 02 0F FD 89 
-1A 00 \dx00000000 	// param[64]
+1A 00 \dx00000000 	// param[127]
 \b1 
 \wxCBFE \dx00000001 \dx00000001 	// 1 .. 1: return 19454;
 \wx80FF // default: return 255;
@@ -105,19 +105,19 @@
 24 * 23 02 0F FC 89 
 1A 00 \dx00000001 
 \b1 
-\wxCBFE \dx00000000 \dx00000000 	// 0 .. 0: return 19454;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wxCBFE // default: return 19454;
 
-// param[64] = (param[0] & 1)
-25 * 9 0D 40 \D& 00 FF \dx00000001 
+// param[127] = (param[0] & 1)
+25 * 9 0D 7F \D& 00 FF \dx00000001 
 
 26 * 7 06 
-40 04 FF \wx0006 
+7F 04 FF \wx0006 
 FF 
 
 // Name: switch_animation_start_WSSB
 27 * 23 02 0F FB 89 
-1A 00 \dx00000000 	// param[64]
+1A 00 \dx00000000 	// param[127]
 \b1 
 \wxCCFE \dx00000001 \dx00000001 	// 1 .. 1: return 19710;
 \wx80FF // default: return 255;
@@ -131,16 +131,16 @@
 \wxCFFE \dx00000003 \dx00000003 	// 3 .. 3: return 20478;
 \wxCCFE // default: return 19710;
 
-// param[64] = (param[0] & 1)
-29 * 9 0D 40 \D& 00 FF \dx00000001 
+// param[127] = (param[0] & 1)
+29 * 9 0D 7F \D& 00 FF \dx00000001 
 
 30 * 7 06 
-40 04 FF \wx0006 
+7F 04 FF \wx0006 
 FF 
 
 // Name: switch_animation_start_Relay_container
 31 * 23 02 0F F9 89 
-1A 00 \dx00000000 	// param[64]
+1A 00 \dx00000000 	// param[127]
 \b1 
 \wxD0FE \dx00000001 \dx00000001 	// 1 .. 1: return 20734;
 \wx80FF // default: return 255;
@@ -149,7 +149,7 @@
 32 * 23 02 0F F8 89 
 1A 00 \dx00000001 
 \b1 
-\wxD0FE \dx00000000 \dx00000000 	// 0 .. 0: return 20734;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wxD0FE // default: return 20734;
 
 33 * 6 01 0F \b34 FF \wx0004 
@@ -390,25 +390,22 @@
 \wx00F3 // default: switch_Iisalmi_position_along_x;
 
 // Name: switch_Iisalmi_building
-180 * 232 02 0F F3 89 
+180 * 211 02 0F F3 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -422,29 +419,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F3 \dx00000000 \dx00000000 	// 0 .. 0: switch_Iisalmi_view;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F3 // default: switch_Iisalmi_view;
 
 // Name: switch_Iisalmi_building_purchase
-181 * 232 02 0F F4 89 
+181 * 211 02 0F F4 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -458,7 +452,7 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Iisalmi_purchase;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: spritelayout_Iisalmi_purchase;
 
 182 * 41 00 0F \b12 01 00 
@@ -470,7 +464,7 @@
 0D 14 
 14 01 
 0E \dx000A99A3 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0000 
 16 01 
 17 04 
@@ -498,29 +492,27 @@
 \dx80000005 \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_Riippa_building
-188 * 65 02 0F F3 89 
+188 * 58 02 0F F3 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000000 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dxFFFFFFFF 	// expr1 - expr2
 \2+ 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F3 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Riippa;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F3 // default: spritelayout_Riippa;
 
 // Name: switch_Riippa_building_baseground
-189 * 65 02 0F F4 89 
+189 * 58 02 0F F4 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000000 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dxFFFFFFFF 	// expr1 - expr2
 \2+ 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_Riippa;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: spritelayout_baseground_Riippa;
 
 // Name: switch_Riippa_gr_ground
@@ -528,7 +520,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F3 \dx00000000 \dx00000000 	// 0 .. 0: switch_Riippa_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F3 // default: switch_Riippa_building;
 
 // Name: switch_Riippa_sa_ground
@@ -536,7 +528,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F3 \dx00000000 \dx00000000 	// 0 .. 0: switch_Riippa_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F3 // default: switch_Riippa_building;
 
 // Name: switch_Riippa_asp_ground
@@ -544,7 +536,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F3 \dx00000000 \dx00000000 	// 0 .. 0: switch_Riippa_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F3 // default: switch_Riippa_building;
 
 // Name: switch_Riippa_di_ground
@@ -552,7 +544,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: switch_Riippa_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: switch_Riippa_building_baseground;
 
 194 * 41 00 0F \b12 01 02 
@@ -564,7 +556,7 @@
 0D 0A 
 14 01 
 0E \dx000A9B10 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -591,7 +583,7 @@
 0D 0A 
 14 01 
 0E \dx000A9B10 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -618,7 +610,7 @@
 0D 0A 
 14 01 
 0E \dx000A9B10 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -645,7 +637,7 @@
 0D 0A 
 14 01 
 0E \dx000A9B10 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -715,25 +707,22 @@
 \wx00F7 // default: switch_Kokkola_position_along_x;
 
 // Name: switch_Kokkola_building
-218 * 232 02 0F F7 89 
+218 * 211 02 0F F7 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -747,29 +736,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: switch_Kokkola_view;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: switch_Kokkola_view;
 
 // Name: switch_Kokkola_building_purchase
-219 * 232 02 0F F6 89 
+219 * 211 02 0F F6 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -783,7 +769,7 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F6 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Kokkola_purchase;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F6 // default: spritelayout_Kokkola_purchase;
 
 220 * 41 00 0F \b12 01 06 
@@ -795,7 +781,7 @@
 0D 14 
 14 01 
 0E \dx000A7FF5 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0000 
 16 01 
 17 04 
@@ -823,29 +809,27 @@
 \dx80000009 \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_Sukeva_building
-226 * 65 02 0F F7 89 
+226 * 58 02 0F F7 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000000 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dxFFFFFFFF 	// expr1 - expr2
 \2+ 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Sukeva;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: spritelayout_Sukeva;
 
 // Name: switch_Sukeva_building_baseground
-227 * 65 02 0F F6 89 
+227 * 58 02 0F F6 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000000 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dxFFFFFFFF 	// expr1 - expr2
 \2+ 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F6 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_Sukeva;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F6 // default: spritelayout_baseground_Sukeva;
 
 // Name: switch_Sukeva_gr_ground
@@ -853,7 +837,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: switch_Sukeva_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: switch_Sukeva_building;
 
 // Name: switch_Sukeva_sa_ground
@@ -861,7 +845,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: switch_Sukeva_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: switch_Sukeva_building;
 
 // Name: switch_Sukeva_asp_ground
@@ -869,7 +853,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: switch_Sukeva_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: switch_Sukeva_building;
 
 // Name: switch_Sukeva_di_ground
@@ -877,7 +861,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F6 \dx00000000 \dx00000000 	// 0 .. 0: switch_Sukeva_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F6 // default: switch_Sukeva_building_baseground;
 
 232 * 41 00 0F \b12 01 07 
@@ -889,7 +873,7 @@
 0D 14 
 14 01 
 0E \dx000A9DEB 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -916,7 +900,7 @@
 0D 14 
 14 01 
 0E \dx000A9DEB 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -943,7 +927,7 @@
 0D 14 
 14 01 
 0E \dx000A9DEB 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -970,7 +954,7 @@
 0D 14 
 14 01 
 0E \dx000A9DEB 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -997,29 +981,27 @@
 \dx8000000A \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_Kauppilanmaki_building
-250 * 65 02 0F F6 89 
+250 * 58 02 0F F6 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000000 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dxFFFFFFFF 	// expr1 - expr2
 \2+ 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F6 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Kauppilanmaki;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F6 // default: spritelayout_Kauppilanmaki;
 
 // Name: switch_Kauppilanmaki_building_baseground
-251 * 65 02 0F F7 89 
+251 * 58 02 0F F7 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000000 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dxFFFFFFFF 	// expr1 - expr2
 \2+ 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_Kauppilanmaki;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: spritelayout_baseground_Kauppilanmaki;
 
 // Name: switch_Kauppilanmaki_gr_ground
@@ -1027,7 +1009,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F6 \dx00000000 \dx00000000 	// 0 .. 0: switch_Kauppilanmaki_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F6 // default: switch_Kauppilanmaki_building;
 
 // Name: switch_Kauppilanmaki_sa_ground
@@ -1035,7 +1017,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F6 \dx00000000 \dx00000000 	// 0 .. 0: switch_Kauppilanmaki_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F6 // default: switch_Kauppilanmaki_building;
 
 // Name: switch_Kauppilanmaki_asp_ground
@@ -1043,7 +1025,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F6 \dx00000000 \dx00000000 	// 0 .. 0: switch_Kauppilanmaki_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F6 // default: switch_Kauppilanmaki_building;
 
 // Name: switch_Kauppilanmaki_di_ground
@@ -1051,7 +1033,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: switch_Kauppilanmaki_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: switch_Kauppilanmaki_building_baseground;
 
 256 * 41 00 0F \b12 01 0B 
@@ -1063,7 +1045,7 @@
 0D 0A 
 14 01 
 0E \dx000A9C7D 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -1090,7 +1072,7 @@
 0D 0A 
 14 01 
 0E \dx000A9C7D 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -1117,7 +1099,7 @@
 0D 0A 
 14 01 
 0E \dx000A9C7D 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -1144,7 +1126,7 @@
 0D 0A 
 14 01 
 0E \dx000A9C7D 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -1171,25 +1153,22 @@
 \dx8000000B \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_Platformskjul_III_building
-274 * 232 02 0F F7 89 
+274 * 211 02 0F F7 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -1203,29 +1182,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Platformskjul_III;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: spritelayout_Platformskjul_III;
 
 // Name: switch_Platformskjul_III_building_baseground
-275 * 232 02 0F F6 89 
+275 * 211 02 0F F6 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -1239,7 +1215,7 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F6 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_Platformskjul_III;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F6 // default: spritelayout_baseground_Platformskjul_III;
 
 // Name: switch_Platformskjul_III_gr_ground
@@ -1247,7 +1223,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: switch_Platformskjul_III_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: switch_Platformskjul_III_building;
 
 // Name: switch_Platformskjul_III_sa_ground
@@ -1255,7 +1231,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: switch_Platformskjul_III_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: switch_Platformskjul_III_building;
 
 // Name: switch_Platformskjul_III_asp_ground
@@ -1263,7 +1239,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: switch_Platformskjul_III_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: switch_Platformskjul_III_building;
 
 // Name: switch_Platformskjul_III_di_ground
@@ -1271,7 +1247,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F6 \dx00000000 \dx00000000 	// 0 .. 0: switch_Platformskjul_III_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F6 // default: switch_Platformskjul_III_building_baseground;
 
 280 * 41 00 0F \b12 01 0F 
@@ -1283,7 +1259,7 @@
 0D 0A 
 14 01 
 0E \dx000A99A3 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -1310,7 +1286,7 @@
 0D 0A 
 14 01 
 0E \dx000A99A3 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -1337,7 +1313,7 @@
 0D 0A 
 14 01 
 0E \dx000A99A3 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -1364,7 +1340,7 @@
 0D 0A 
 14 01 
 0E \dx000A99A3 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -1391,29 +1367,27 @@
 \dx8000000C \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_SukevaF_building
-298 * 65 02 0F F6 89 
+298 * 58 02 0F F6 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000000 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dxFFFFFFFF 	// expr1 - expr2
 \2+ 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F6 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_SukevaF;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F6 // default: spritelayout_SukevaF;
 
 // Name: switch_SukevaF_building_baseground
-299 * 65 02 0F F7 89 
+299 * 58 02 0F F7 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000000 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dxFFFFFFFF 	// expr1 - expr2
 \2+ 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_SukevaF;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: spritelayout_baseground_SukevaF;
 
 // Name: switch_SukevaF_gr_ground
@@ -1421,7 +1395,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F6 \dx00000000 \dx00000000 	// 0 .. 0: switch_SukevaF_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F6 // default: switch_SukevaF_building;
 
 // Name: switch_SukevaF_sa_ground
@@ -1429,7 +1403,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F6 \dx00000000 \dx00000000 	// 0 .. 0: switch_SukevaF_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F6 // default: switch_SukevaF_building;
 
 // Name: switch_SukevaF_asp_ground
@@ -1437,7 +1411,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F6 \dx00000000 \dx00000000 	// 0 .. 0: switch_SukevaF_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F6 // default: switch_SukevaF_building;
 
 // Name: switch_SukevaF_di_ground
@@ -1445,7 +1419,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: switch_SukevaF_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: switch_SukevaF_building_baseground;
 
 304 * 41 00 0F \b12 01 23 
@@ -1457,7 +1431,7 @@
 0D 05 
 14 01 
 0E \dx000AC196 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -1484,7 +1458,7 @@
 0D 05 
 14 01 
 0E \dx000AC196 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -1511,7 +1485,7 @@
 0D 05 
 14 01 
 0E \dx000AC196 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -1538,7 +1512,7 @@
 0D 05 
 14 01 
 0E \dx000AC196 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 02 
@@ -1595,29 +1569,27 @@
 \wx00F4 // default: spritelayout_Kurkimaki_warehouse_baseground_front;
 
 // Name: switch_Kurkimaki_warehouse_building
-328 * 65 02 0F F7 89 
+328 * 58 02 0F F7 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000001 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: switch_Kurkimaki_warehouse_position;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: switch_Kurkimaki_warehouse_position;
 
 // Name: switch_Kurkimaki_warehouse_baseground_building
-329 * 65 02 0F F4 89 
+329 * 58 02 0F F4 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000001 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: switch_Kurkimaki_warehouse_baseground_position;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: switch_Kurkimaki_warehouse_baseground_position;
 
 // Name: switch_Kurkimaki_warehouse_ground_gr
@@ -1625,7 +1597,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: switch_Kurkimaki_warehouse_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: switch_Kurkimaki_warehouse_building;
 
 // Name: switch_Kurkimaki_warehouse_ground_sa
@@ -1633,7 +1605,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: switch_Kurkimaki_warehouse_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: switch_Kurkimaki_warehouse_building;
 
 // Name: switch_Kurkimaki_warehouse_ground_asp
@@ -1641,59 +1613,55 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F7 \dx00000000 \dx00000000 	// 0 .. 0: switch_Kurkimaki_warehouse_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F7 // default: switch_Kurkimaki_warehouse_building;
 
 // Name: switch_Kurkimaki_warehouse_building_purchase_gr
-333 * 65 02 0F F1 89 
+333 * 58 02 0F F1 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000001 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F5 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Kurkimaki_warehouse_purchase_gr_sa;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F5 // default: spritelayout_Kurkimaki_warehouse_purchase_gr_sa;
 
 // Name: switch_Kurkimaki_warehouse_building_purchase_sa
-334 * 65 02 0F F5 89 
+334 * 58 02 0F F5 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000001 	// expr1 - expr2
 \2+ 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F5 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Kurkimaki_warehouse_purchase_gr_sa;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F5 // default: spritelayout_Kurkimaki_warehouse_purchase_gr_sa;
 
 // Name: switch_Kurkimaki_warehouse_building_purchase_asp
-335 * 65 02 0F F0 89 
+335 * 58 02 0F F0 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000001 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F2 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Kurkimaki_warehouse_purchase_asp_di;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F2 // default: spritelayout_Kurkimaki_warehouse_purchase_asp_di;
 
 // Name: switch_Kurkimaki_warehouse_building_purchase_di
-336 * 65 02 0F F2 89 
+336 * 58 02 0F F2 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000001 	// expr1 - expr2
 \2+ 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F2 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Kurkimaki_warehouse_purchase_asp_di;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F2 // default: spritelayout_Kurkimaki_warehouse_purchase_asp_di;
 
 337 * 41 00 0F \b12 01 27 
@@ -1705,7 +1673,7 @@
 0D 05 
 14 01 
 0E \dx000AB351 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0000 
 16 01 
 17 02 
@@ -1733,7 +1701,7 @@
 0D 05 
 14 01 
 0E \dx000AB351 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0000 
 16 01 
 17 02 
@@ -1761,7 +1729,7 @@
 0D 05 
 14 01 
 0E \dx000AB351 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0000 
 16 01 
 17 02 
@@ -1789,7 +1757,7 @@
 0D 05 
 14 01 
 0E \dx000AB351 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0000 
 16 01 
 17 02 
@@ -1817,25 +1785,22 @@
 \dx80000011 \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_AirakselaINT_building
-355 * 232 02 0F F4 89 
+355 * 211 02 0F F4 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -1849,29 +1814,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_AirakselaINT;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: spritelayout_AirakselaINT;
 
 // Name: switch_AirakselaINT_building_baseground
-356 * 232 02 0F F2 89 
+356 * 211 02 0F F2 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -1885,7 +1847,7 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F2 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_AirakselaINT;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F2 // default: spritelayout_baseground_AirakselaINT;
 
 // Name: switch_AirakselaINT_gr_ground
@@ -1893,7 +1855,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: switch_AirakselaINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: switch_AirakselaINT_building;
 
 // Name: switch_AirakselaINT_sa_ground
@@ -1901,7 +1863,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: switch_AirakselaINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: switch_AirakselaINT_building;
 
 // Name: switch_AirakselaINT_asp_ground
@@ -1909,7 +1871,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: switch_AirakselaINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: switch_AirakselaINT_building;
 
 // Name: switch_AirakselaINT_di_ground
@@ -1917,7 +1879,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F2 \dx00000000 \dx00000000 	// 0 .. 0: switch_AirakselaINT_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F2 // default: switch_AirakselaINT_building_baseground;
 
 361 * 49 00 0F \b15 01 2B 
@@ -1929,7 +1891,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -1961,7 +1923,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -1993,7 +1955,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2025,7 +1987,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2057,25 +2019,22 @@
 \dx80000012 \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_MarkkalaINT_building
-379 * 232 02 0F F2 89 
+379 * 211 02 0F F2 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -2089,29 +2048,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F2 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_MarkkalaINT;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F2 // default: spritelayout_MarkkalaINT;
 
 // Name: switch_MarkkalaINT_building_baseground
-380 * 232 02 0F F4 89 
+380 * 211 02 0F F4 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -2125,7 +2081,7 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_MarkkalaINT;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: spritelayout_baseground_MarkkalaINT;
 
 // Name: switch_MarkkalaINT_gr_ground
@@ -2133,7 +2089,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F2 \dx00000000 \dx00000000 	// 0 .. 0: switch_MarkkalaINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F2 // default: switch_MarkkalaINT_building;
 
 // Name: switch_MarkkalaINT_sa_ground
@@ -2141,7 +2097,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F2 \dx00000000 \dx00000000 	// 0 .. 0: switch_MarkkalaINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F2 // default: switch_MarkkalaINT_building;
 
 // Name: switch_MarkkalaINT_asp_ground
@@ -2149,7 +2105,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F2 \dx00000000 \dx00000000 	// 0 .. 0: switch_MarkkalaINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F2 // default: switch_MarkkalaINT_building;
 
 // Name: switch_MarkkalaINT_di_ground
@@ -2157,7 +2113,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: switch_MarkkalaINT_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: switch_MarkkalaINT_building_baseground;
 
 385 * 49 00 0F \b15 01 2F 
@@ -2169,7 +2125,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2201,7 +2157,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2233,7 +2189,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2265,7 +2221,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2297,25 +2253,22 @@
 \dx80000013 \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_SuonenjokiINT_building
-403 * 232 02 0F F4 89 
+403 * 211 02 0F F4 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -2329,29 +2282,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_SuonenjokiINT;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: spritelayout_SuonenjokiINT;
 
 // Name: switch_SuonenjokiINT_building_baseground
-404 * 232 02 0F F2 89 
+404 * 211 02 0F F2 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -2365,7 +2315,7 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F2 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_SuonenjokiINT;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F2 // default: spritelayout_baseground_SuonenjokiINT;
 
 // Name: switch_SuonenjokiINT_gr_ground
@@ -2373,7 +2323,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: switch_SuonenjokiINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: switch_SuonenjokiINT_building;
 
 // Name: switch_SuonenjokiINT_sa_ground
@@ -2381,7 +2331,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: switch_SuonenjokiINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: switch_SuonenjokiINT_building;
 
 // Name: switch_SuonenjokiINT_asp_ground
@@ -2389,7 +2339,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: switch_SuonenjokiINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: switch_SuonenjokiINT_building;
 
 // Name: switch_SuonenjokiINT_di_ground
@@ -2397,7 +2347,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F2 \dx00000000 \dx00000000 	// 0 .. 0: switch_SuonenjokiINT_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F2 // default: switch_SuonenjokiINT_building_baseground;
 
 409 * 49 00 0F \b15 01 33 
@@ -2409,7 +2359,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2441,7 +2391,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2473,7 +2423,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2505,7 +2455,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2537,25 +2487,22 @@
 \dx80000014 \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_TaipaleINT_building
-427 * 232 02 0F F2 89 
+427 * 211 02 0F F2 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -2569,29 +2516,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F2 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_TaipaleINT;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F2 // default: spritelayout_TaipaleINT;
 
 // Name: switch_TaipaleINT_building_baseground
-428 * 232 02 0F F4 89 
+428 * 211 02 0F F4 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -2605,7 +2549,7 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_TaipaleINT;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: spritelayout_baseground_TaipaleINT;
 
 // Name: switch_TaipaleINT_gr_ground
@@ -2613,7 +2557,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F2 \dx00000000 \dx00000000 	// 0 .. 0: switch_TaipaleINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F2 // default: switch_TaipaleINT_building;
 
 // Name: switch_TaipaleINT_sa_ground
@@ -2621,7 +2565,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F2 \dx00000000 \dx00000000 	// 0 .. 0: switch_TaipaleINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F2 // default: switch_TaipaleINT_building;
 
 // Name: switch_TaipaleINT_asp_ground
@@ -2629,7 +2573,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F2 \dx00000000 \dx00000000 	// 0 .. 0: switch_TaipaleINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F2 // default: switch_TaipaleINT_building;
 
 // Name: switch_TaipaleINT_di_ground
@@ -2637,7 +2581,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: switch_TaipaleINT_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: switch_TaipaleINT_building_baseground;
 
 433 * 49 00 0F \b15 01 37 
@@ -2649,7 +2593,7 @@
 0D 1E 
 14 01 
 0E \dx000B117C 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2681,7 +2625,7 @@
 0D 1E 
 14 01 
 0E \dx000B117C 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2713,7 +2657,7 @@
 0D 1E 
 14 01 
 0E \dx000B117C 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2745,7 +2689,7 @@
 0D 1E 
 14 01 
 0E \dx000B117C 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2777,25 +2721,22 @@
 \dx80000015 \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_KarhukangasINT_building
-451 * 232 02 0F F4 89 
+451 * 211 02 0F F4 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -2809,29 +2750,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_KarhukangasINT;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: spritelayout_KarhukangasINT;
 
 // Name: switch_KarhukangasINT_building_baseground
-452 * 232 02 0F FD 89 
+452 * 211 02 0F FD 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -2845,7 +2783,7 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FD \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_KarhukangasINT;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FD // default: spritelayout_baseground_KarhukangasINT;
 
 // Name: switch_KarhukangasINT_gr_ground
@@ -2853,7 +2791,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: switch_KarhukangasINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: switch_KarhukangasINT_building;
 
 // Name: switch_KarhukangasINT_sa_ground
@@ -2861,7 +2799,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: switch_KarhukangasINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: switch_KarhukangasINT_building;
 
 // Name: switch_KarhukangasINT_asp_ground
@@ -2869,7 +2807,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F4 \dx00000000 \dx00000000 	// 0 .. 0: switch_KarhukangasINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F4 // default: switch_KarhukangasINT_building;
 
 // Name: switch_KarhukangasINT_di_ground
@@ -2877,7 +2815,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FD \dx00000000 \dx00000000 	// 0 .. 0: switch_KarhukangasINT_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FD // default: switch_KarhukangasINT_building_baseground;
 
 457 * 49 00 0F \b15 01 3B 
@@ -2889,7 +2827,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2921,7 +2859,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2953,7 +2891,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -2985,7 +2923,7 @@
 0D 1E 
 14 01 
 0E \dx000B08EC 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -3017,25 +2955,22 @@
 \dx80000016 \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_SiilinjarviINT_building
-475 * 232 02 0F FD 89 
+475 * 211 02 0F FD 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -3049,29 +2984,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FD \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_SiilinjarviINT;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FD // default: spritelayout_SiilinjarviINT;
 
 // Name: switch_SiilinjarviINT_building_baseground
-476 * 232 02 0F FF 89 
+476 * 211 02 0F FF 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -3085,7 +3017,7 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_SiilinjarviINT;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: spritelayout_baseground_SiilinjarviINT;
 
 // Name: switch_SiilinjarviINT_gr_ground
@@ -3093,7 +3025,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FD \dx00000000 \dx00000000 	// 0 .. 0: switch_SiilinjarviINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FD // default: switch_SiilinjarviINT_building;
 
 // Name: switch_SiilinjarviINT_sa_ground
@@ -3101,7 +3033,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FD \dx00000000 \dx00000000 	// 0 .. 0: switch_SiilinjarviINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FD // default: switch_SiilinjarviINT_building;
 
 // Name: switch_SiilinjarviINT_asp_ground
@@ -3109,7 +3041,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FD \dx00000000 \dx00000000 	// 0 .. 0: switch_SiilinjarviINT_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FD // default: switch_SiilinjarviINT_building;
 
 // Name: switch_SiilinjarviINT_di_ground
@@ -3117,7 +3049,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_SiilinjarviINT_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_SiilinjarviINT_building_baseground;
 
 481 * 49 00 0F \b15 01 3F 
@@ -3129,7 +3061,7 @@
 0D 19 
 14 01 
 0E \dx000B0612 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -3161,7 +3093,7 @@
 0D 19 
 14 01 
 0E \dx000B0612 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -3193,7 +3125,7 @@
 0D 19 
 14 01 
 0E \dx000B0612 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -3225,7 +3157,7 @@
 0D 19 
 14 01 
 0E \dx000B0612 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -3257,25 +3189,22 @@
 \dx80000017 \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_Eqca_s_building
-499 * 232 02 0F FF 89 
+499 * 211 02 0F FF 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -3289,29 +3218,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Eqca_s;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: spritelayout_Eqca_s;
 
 // Name: switch_Eqca_s_building_baseground
-500 * 232 02 0F FB 89 
+500 * 211 02 0F FB 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -3325,22 +3251,20 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_Eqca_s;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: spritelayout_baseground_Eqca_s;
 
 // Name: switch_Eqca_s_tr_ground
-501 * 152 02 0F FA 89 
+501 * 138 02 0F FA 89 
 41 20 \dx00000007 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 41 20 \dx00000007 
 \2cmp 1A 20 \dx00000004 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000239 	// expr1 - expr2
 \2+ 1A 20 \dx00000F8D 
 \2* 7D 81 20 \dxFFFFFFFF 
@@ -3350,7 +3274,7 @@
 \2+ 7D 82 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_s_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eqca_s_building_baseground;
 
 // Name: switch_Eqca_s_tr_ground_purchase
@@ -3358,7 +3282,7 @@
 1A 20 \dx00000F8D 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_s_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eqca_s_building_baseground;
 
 // Name: switch_Eqca_s_gr_ground
@@ -3366,7 +3290,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_s_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eqca_s_building;
 
 // Name: switch_Eqca_s_sa_ground
@@ -3374,7 +3298,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_s_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eqca_s_building;
 
 // Name: switch_Eqca_s_asp_ground
@@ -3382,7 +3306,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_s_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eqca_s_building;
 
 // Name: switch_Eqca_s_di_ground
@@ -3390,7 +3314,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_s_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eqca_s_building_baseground;
 
 507 * 41 00 0F \b12 01 43 
@@ -3402,7 +3326,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -3430,7 +3354,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -3457,7 +3381,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -3484,7 +3408,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -3511,7 +3435,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -3538,25 +3462,22 @@
 \dx80000018 \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_Eqca_m_building
-529 * 232 02 0F FB 89 
+529 * 211 02 0F FB 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -3570,29 +3491,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Eqca_m;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: spritelayout_Eqca_m;
 
 // Name: switch_Eqca_m_building_baseground
-530 * 232 02 0F FF 89 
+530 * 211 02 0F FF 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -3606,22 +3524,20 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_Eqca_m;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: spritelayout_baseground_Eqca_m;
 
 // Name: switch_Eqca_m_tr_ground
-531 * 152 02 0F FE 89 
+531 * 138 02 0F FE 89 
 41 20 \dx00000007 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 41 20 \dx00000007 
 \2cmp 1A 20 \dx00000004 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000239 	// expr1 - expr2
 \2+ 1A 20 \dx00000F8D 
 \2* 7D 81 20 \dxFFFFFFFF 
@@ -3631,7 +3547,7 @@
 \2+ 7D 82 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_m_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eqca_m_building_baseground;
 
 // Name: switch_Eqca_m_tr_ground_purchase
@@ -3639,7 +3555,7 @@
 1A 20 \dx00000F8D 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_m_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eqca_m_building_baseground;
 
 // Name: switch_Eqca_m_gr_ground
@@ -3647,7 +3563,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_m_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eqca_m_building;
 
 // Name: switch_Eqca_m_sa_ground
@@ -3655,7 +3571,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_m_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eqca_m_building;
 
 // Name: switch_Eqca_m_asp_ground
@@ -3663,7 +3579,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_m_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eqca_m_building;
 
 // Name: switch_Eqca_m_di_ground
@@ -3671,7 +3587,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_m_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eqca_m_building_baseground;
 
 537 * 41 00 0F \b12 01 44 
@@ -3683,7 +3599,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -3711,7 +3627,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -3738,7 +3654,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -3765,7 +3681,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -3792,7 +3708,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -3819,25 +3735,22 @@
 \dx80000019 \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_Eqca_l_building
-559 * 232 02 0F FF 89 
+559 * 211 02 0F FF 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -3851,29 +3764,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Eqca_l;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: spritelayout_Eqca_l;
 
 // Name: switch_Eqca_l_building_baseground
-560 * 232 02 0F FB 89 
+560 * 211 02 0F FB 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -3887,22 +3797,20 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_Eqca_l;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: spritelayout_baseground_Eqca_l;
 
 // Name: switch_Eqca_l_tr_ground
-561 * 152 02 0F FD 89 
+561 * 138 02 0F FD 89 
 41 20 \dx00000007 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 41 20 \dx00000007 
 \2cmp 1A 20 \dx00000004 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000239 	// expr1 - expr2
 \2+ 1A 20 \dx00000F8D 
 \2* 7D 81 20 \dxFFFFFFFF 
@@ -3912,7 +3820,7 @@
 \2+ 7D 82 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_l_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eqca_l_building_baseground;
 
 // Name: switch_Eqca_l_tr_ground_purchase
@@ -3920,7 +3828,7 @@
 1A 20 \dx00000F8D 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_l_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eqca_l_building_baseground;
 
 // Name: switch_Eqca_l_gr_ground
@@ -3928,7 +3836,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_l_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eqca_l_building;
 
 // Name: switch_Eqca_l_sa_ground
@@ -3936,7 +3844,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_l_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eqca_l_building;
 
 // Name: switch_Eqca_l_asp_ground
@@ -3944,7 +3852,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_l_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eqca_l_building;
 
 // Name: switch_Eqca_l_di_ground
@@ -3952,7 +3860,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_l_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eqca_l_building_baseground;
 
 567 * 41 00 0F \b12 01 45 
@@ -3964,7 +3872,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -3992,7 +3900,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -4019,7 +3927,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -4046,7 +3954,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -4073,7 +3981,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -4100,25 +4008,22 @@
 \dx8000001A \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_Eqca_c_building
-589 * 232 02 0F FB 89 
+589 * 211 02 0F FB 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -4132,29 +4037,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Eqca_c;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: spritelayout_Eqca_c;
 
 // Name: switch_Eqca_c_building_baseground
-590 * 232 02 0F FF 89 
+590 * 211 02 0F FF 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -4168,22 +4070,20 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_Eqca_c;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: spritelayout_baseground_Eqca_c;
 
 // Name: switch_Eqca_c_tr_ground
-591 * 152 02 0F F4 89 
+591 * 138 02 0F F4 89 
 41 20 \dx00000007 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 41 20 \dx00000007 
 \2cmp 1A 20 \dx00000004 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000239 	// expr1 - expr2
 \2+ 1A 20 \dx00000F8D 
 \2* 7D 81 20 \dxFFFFFFFF 
@@ -4193,7 +4093,7 @@
 \2+ 7D 82 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_c_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eqca_c_building_baseground;
 
 // Name: switch_Eqca_c_tr_ground_purchase
@@ -4201,7 +4101,7 @@
 1A 20 \dx00000F8D 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_c_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eqca_c_building_baseground;
 
 // Name: switch_Eqca_c_gr_ground
@@ -4209,7 +4109,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_c_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eqca_c_building;
 
 // Name: switch_Eqca_c_sa_ground
@@ -4217,7 +4117,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_c_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eqca_c_building;
 
 // Name: switch_Eqca_c_asp_ground
@@ -4225,7 +4125,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_c_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eqca_c_building;
 
 // Name: switch_Eqca_c_di_ground
@@ -4233,7 +4133,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eqca_c_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eqca_c_building_baseground;
 
 597 * 41 00 0F \b12 01 46 
@@ -4245,7 +4145,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -4273,7 +4173,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -4300,7 +4200,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -4327,7 +4227,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -4354,7 +4254,7 @@
 0D 05 
 14 01 
 0E \dx000AEF3E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -4381,25 +4281,22 @@
 \dx8000001B \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_RHK_container_building
-619 * 232 02 0F FF 89 
+619 * 211 02 0F FF 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -4413,29 +4310,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_RHK_container;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: spritelayout_RHK_container;
 
 // Name: switch_RHK_container_building_baseground
-620 * 232 02 0F FB 89 
+620 * 211 02 0F FB 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -4449,22 +4343,20 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_RHK_container;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: spritelayout_baseground_RHK_container;
 
 // Name: switch_RHK_container_tr_ground
-621 * 152 02 0F FA 89 
+621 * 138 02 0F FA 89 
 41 20 \dx00000007 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 41 20 \dx00000007 
 \2cmp 1A 20 \dx00000004 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000239 	// expr1 - expr2
 \2+ 1A 20 \dx00000F8D 
 \2* 7D 81 20 \dxFFFFFFFF 
@@ -4474,7 +4366,7 @@
 \2+ 7D 82 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_RHK_container_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_RHK_container_building_baseground;
 
 // Name: switch_RHK_container_tr_ground_purchase
@@ -4482,7 +4374,7 @@
 1A 20 \dx00000F8D 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_RHK_container_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_RHK_container_building_baseground;
 
 // Name: switch_RHK_container_gr_ground
@@ -4490,7 +4382,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_RHK_container_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_RHK_container_building;
 
 // Name: switch_RHK_container_sa_ground
@@ -4498,7 +4390,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_RHK_container_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_RHK_container_building;
 
 // Name: switch_RHK_container_asp_ground
@@ -4506,7 +4398,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_RHK_container_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_RHK_container_building;
 
 // Name: switch_RHK_container_di_ground
@@ -4514,7 +4406,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_RHK_container_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_RHK_container_building_baseground;
 
 627 * 41 00 0F \b12 01 57 
@@ -4526,7 +4418,7 @@
 0D 0A 
 14 01 
 0E \dx000B229B 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -4554,7 +4446,7 @@
 0D 0A 
 14 01 
 0E \dx000B229B 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -4581,7 +4473,7 @@
 0D 0A 
 14 01 
 0E \dx000B229B 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -4608,7 +4500,7 @@
 0D 0A 
 14 01 
 0E \dx000B229B 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -4635,7 +4527,7 @@
 0D 0A 
 14 01 
 0E \dx000B229B 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -4662,25 +4554,22 @@
 \dx8000001C \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_Eq_containers_1970_building
-649 * 232 02 0F FB 89 
+649 * 211 02 0F FB 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -4694,29 +4583,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Eq_containers_1970;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: spritelayout_Eq_containers_1970;
 
 // Name: switch_Eq_containers_1970_building_baseground
-650 * 232 02 0F FF 89 
+650 * 211 02 0F FF 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -4730,22 +4616,20 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_Eq_containers_1970;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: spritelayout_baseground_Eq_containers_1970;
 
 // Name: switch_Eq_containers_1970_tr_ground
-651 * 152 02 0F FE 89 
+651 * 138 02 0F FE 89 
 41 20 \dx00000007 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 41 20 \dx00000007 
 \2cmp 1A 20 \dx00000004 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000239 	// expr1 - expr2
 \2+ 1A 20 \dx00000F8D 
 \2* 7D 81 20 \dxFFFFFFFF 
@@ -4755,7 +4639,7 @@
 \2+ 7D 82 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eq_containers_1970_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eq_containers_1970_building_baseground;
 
 // Name: switch_Eq_containers_1970_tr_ground_purchase
@@ -4763,7 +4647,7 @@
 1A 20 \dx00000F8D 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eq_containers_1970_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eq_containers_1970_building_baseground;
 
 // Name: switch_Eq_containers_1970_gr_ground
@@ -4771,7 +4655,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eq_containers_1970_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eq_containers_1970_building;
 
 // Name: switch_Eq_containers_1970_sa_ground
@@ -4779,7 +4663,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eq_containers_1970_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eq_containers_1970_building;
 
 // Name: switch_Eq_containers_1970_asp_ground
@@ -4787,7 +4671,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FB \dx00000000 \dx00000000 	// 0 .. 0: switch_Eq_containers_1970_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FB // default: switch_Eq_containers_1970_building;
 
 // Name: switch_Eq_containers_1970_di_ground
@@ -4795,7 +4679,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eq_containers_1970_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eq_containers_1970_building_baseground;
 
 657 * 49 00 0F \b15 01 5C 
@@ -4807,7 +4691,7 @@
 0D 06 
 14 01 
 0E \dx000AFAA8 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -4840,7 +4724,7 @@
 0D 06 
 14 01 
 0E \dx000AFAA8 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -4872,7 +4756,7 @@
 0D 06 
 14 01 
 0E \dx000AFAA8 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -4904,7 +4788,7 @@
 0D 06 
 14 01 
 0E \dx000AFAA8 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -4936,7 +4820,7 @@
 0D 06 
 14 01 
 0E \dx000AFAA8 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx1840 
 16 01 
 17 04 
@@ -4968,25 +4852,22 @@
 \dx8000001D \wx0002 \b0 \b0 \b0 \b16 \b16 \b16 01 
 
 // Name: switch_Eq_containers_1990_building
-679 * 232 02 0F FF 89 
+679 * 211 02 0F FF 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -5000,29 +4881,26 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Eq_containers_1990;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: spritelayout_Eq_containers_1990;
 
 // Name: switch_Eq_containers_1990_building_baseground
-680 * 232 02 0F F9 89 
+680 * 211 02 0F F9 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000002 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000082 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000083 	// !guard
 \2r 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000003 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000003 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2* 7D 83 20 \dxFFFFFFFF 
@@ -5036,22 +4914,20 @@
 \2+ 7D 85 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F9 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_baseground_Eq_containers_1990;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F9 // default: spritelayout_baseground_Eq_containers_1990;
 
 // Name: switch_Eq_containers_1990_tr_ground
-681 * 152 02 0F F8 89 
+681 * 138 02 0F F8 89 
 41 20 \dx00000007 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000080 	// guard
 \2^ 1A 20 \dx00000001 
 \2sto 1A 20 \dx00000081 	// !guard
 \2r 41 20 \dx00000007 
 \2cmp 1A 20 \dx00000004 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000239 	// expr1 - expr2
 \2+ 1A 20 \dx00000F8D 
 \2* 7D 81 20 \dxFFFFFFFF 
@@ -5061,7 +4937,7 @@
 \2+ 7D 82 20 \dxFFFFFFFF 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F9 \dx00000000 \dx00000000 	// 0 .. 0: switch_Eq_containers_1990_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F9 // default: switch_Eq_containers_1990_building_baseground;
 
 // Name: switch_Eq_containers_1990_tr_ground_purchase
@@ -5069,7 +4945,7 @@
 1A 20 \dx00000F8D 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F9 \dx00000000 \dx00000000 	// 0 .. 0: switch_Eq_containers_1990_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F9 // default: switch_Eq_containers_1990_building_baseground;
 
 // Name: switch_Eq_containers_1990_gr_ground
@@ -5077,7 +4953,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eq_containers_1990_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eq_containers_1990_building;
 
 // Name: switch_Eq_containers_1990_sa_ground
@@ -5085,7 +4961,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eq_containers_1990_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eq_containers_1990_building;
 
 // Name: switch_Eq_containers_1990_asp_ground
@@ -5093,7 +4969,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00FF \dx00000000 \dx00000000 	// 0 .. 0: switch_Eq_containers_1990_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00FF // default: switch_Eq_containers_1990_building;
 
 // Name: switch_Eq_containers_1990_di_ground
@@ -5101,7 +4977,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F9 \dx00000000 \dx00000000 	// 0 .. 0: switch_Eq_containers_1990_building_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F9 // default: switch_Eq_containers_1990_building_baseground;
 
 687 * 41 00 0F \b12 01 61 
@@ -5113,7 +4989,7 @@
 0D 08 
 14 01 
 0E \dx000B1E53 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -5141,7 +5017,7 @@
 0D 08 
 14 01 
 0E \dx000B1E53 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -5168,7 +5044,7 @@
 0D 08 
 14 01 
 0E \dx000B1E53 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -5195,7 +5071,7 @@
 0D 08 
 14 01 
 0E \dx000B1E53 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -5222,7 +5098,7 @@
 0D 08 
 14 01 
 0E \dx000B1E53 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 04 
@@ -5269,16 +5145,15 @@
 \wx00F9 // default: spritelayout_Pm_CTC_tower_front;
 
 // Name: switch_Pm_CTC_tower_building
-713 * 65 02 0F F9 89 
+713 * 58 02 0F F9 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000001 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F9 \dx00000000 \dx00000000 	// 0 .. 0: switch_Pm_CTC_tower_position;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F9 // default: switch_Pm_CTC_tower_position;
 
 // Name: switch_Pm_CTC_tower_ground_gv
@@ -5286,7 +5161,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F9 \dx00000000 \dx00000000 	// 0 .. 0: switch_Pm_CTC_tower_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F9 // default: switch_Pm_CTC_tower_building;
 
 // Name: switch_Pm_CTC_tower_ground_asp
@@ -5294,33 +5169,31 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000001 
 \b1 
-\wx00F9 \dx00000000 \dx00000000 	// 0 .. 0: switch_Pm_CTC_tower_building;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F9 // default: switch_Pm_CTC_tower_building;
 
 // Name: switch_Pm_CTC_tower_building_gv_purchase
-716 * 65 02 0F FF 89 
+716 * 58 02 0F FF 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000001 	// expr1 - expr2
 \2+ 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F8 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Pm_CTC_tower_purchase;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F8 // default: spritelayout_Pm_CTC_tower_purchase;
 
 // Name: switch_Pm_CTC_tower_building_asp_purchase
-717 * 65 02 0F F8 89 
+717 * 58 02 0F F8 89 
 48 20 \dx000000FF 
 \2cmp 1A 20 \dx00000001 
 \2& 1A 20 \dx00000001 
-\2u< 1A 20 \dx00000001 
 \2* 1A 20 \dx00000001 	// expr1 - expr2
 \2+ 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F8 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_Pm_CTC_tower_purchase;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F8 // default: spritelayout_Pm_CTC_tower_purchase;
 
 718 * 41 00 0F \b12 01 66 
@@ -5332,7 +5205,7 @@
 0D 28 
 14 01 
 0E \dx000B0612 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0000 
 16 01 
 17 02 
@@ -5360,7 +5233,7 @@
 0D 28 
 14 01 
 0E \dx000B0612 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0000 
 16 01 
 17 02 
@@ -5390,7 +5263,7 @@
 1A 20 \dx00000000 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F9 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_basetiles;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F9 // default: spritelayout_basetiles;
 
 // Name: switch_basetiles_sa_ground
@@ -5398,7 +5271,7 @@
 1A 20 \dx00000001 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F9 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_basetiles;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F9 // default: spritelayout_basetiles;
 
 // Name: switch_basetiles_asp_ground
@@ -5406,7 +5279,7 @@
 1A 20 \dx00000002 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F9 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_basetiles;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F9 // default: spritelayout_basetiles;
 
 // Name: switch_basetiles_conc_ground
@@ -5414,7 +5287,7 @@
 1A 20 \dx00000003 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F9 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_basetiles;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F9 // default: spritelayout_basetiles;
 
 // Name: switch_basetiles_di_ground
@@ -5422,7 +5295,7 @@
 1A 20 \dx00000F54 
 \2sto 1A 00 \dx00000000 
 \b1 
-\wx00F8 \dx00000000 \dx00000000 	// 0 .. 0: spritelayout_basetiles_baseground;
+\wx8000 \dx00000001 \dx00000000 	// Bogus range to avoid nvar == 0
 \wx00F8 // default: spritelayout_basetiles_baseground;
 
 733 * 41 00 0F \b12 01 68 
@@ -5434,7 +5307,7 @@
 0D 01 
 14 01 
 0E \dx0000016E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 01 
@@ -5461,7 +5334,7 @@
 0D 01 
 14 01 
 0E \dx0000016E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 01 
@@ -5488,7 +5361,7 @@
 0D 01 
 14 01 
 0E \dx0000016E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 01 
@@ -5515,7 +5388,7 @@
 0D 01 
 14 01 
 0E \dx0000016E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 01 
@@ -5542,7 +5415,7 @@
 0D 01 
 14 01 
 0E \dx0000016E 
-0F \dxFFFFFFFF 
+0F \dx00000000 
 10 \wx0800 
 16 01 
 17 01 
Only in /home/openttd/public_html/friss/nightlies/REBUILD/r43: translations
