(svn r23667) -Release: 1.2.0-beta1

2025-08-13 01:29:10 +00:00 · 2011-12-24 09:12:37 +00:00
494 changed files with 13224 additions and 26250 deletions
--- a/4
+++ b/4
@@ -93,7 +93,7 @@ FILE_PATTERNS          = *.c \
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = */3rdparty */.svn */script/api
+EXCLUDE_PATTERNS       = */3rdparty */.svn
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
@@ -195,7 +195,7 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = ENABLE_NETWORK WITH_ZLIB WITH_LZO WITH_LZMA WITH_SDL WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE _GNU_SOURCE FINAL=
+PREDEFINED             = ENABLE_NETWORK WITH_ZLIB WITH_LZO WITH_LZMA WITH_SDL WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE _GNU_SOURCE
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
--- a/Makefile.grf.in
+++ b/Makefile.grf.in
@@ -66,7 +66,7 @@ $(OBJS_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites
 	$(Q) gcc -I$(GRF_DIR) -C -E - < "$(GRF_DIR)/openttd.nfo" | sed -e '/^#/d' -e '/^$$/d' > $(OBJS_DIR)/sprites/openttd.nfo
 	$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/openttd.nfo
 	$(E) '$(STAGE) Compiling openttd.grf'
-	$(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/openttd.grf
+	$(Q) $(GRFCODEC) -s -e -p1 $(OBJS_DIR)/openttd.grf

 # Clean up temporary files.
 clean:
--- a/Makefile.in
+++ b/Makefile.in
@@ -126,13 +126,6 @@ lang:
 mrproper:
 	@for dir in $(DIRS); do \
 		$(MAKE) -C $$dir mrproper; \
-	done
-# Don't be tempted to merge these two for loops. Doing that breaks make
-# --dry-run, since make has this "feature" that it always runs commands
-# containing $(MAKE), even when --dry-run is passed. The objective is of
-# course to also get a dry-run of submakes, but make is not smart enough
-# to see that a for loop runs both a submake and an actual command.
-	@for dir in $(DIRS); do \
 		rm -f $$dir/Makefile; \
 	done
 	$(Q)rm -rf objs
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -37,6 +37,7 @@ STAGE          = !!STAGE!!
 MAKEDEPEND     = !!MAKEDEPEND!!
 CFLAGS_MAKEDEP = !!CFLAGS_MAKEDEP!!
 SORT           = !!SORT!!
+REVISION       = !!REVISION!!
 AWK            = !!AWK!!
 CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!!
 CONFIG_CACHE_LINKER   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!!
@@ -93,9 +94,15 @@ $(LANG_OBJS_DIR)/table/strings.h: $(LANG_DIR)/english.txt $(LANG_OBJS_DIR)/$(STR
 VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
 MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3 -d'	')

+ifdef REVISION
+# Use specified revision (which should be of the form "r000").
+REV := $(REVISION)
+REV_NR := $(shell echo $(REVISION) | sed "s@[^0-9]@@g")
+else
 # Use autodetected revisions
 REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
 REV_NR   := $(shell echo "$(VERSIONS)" | cut -f 2 -d'	')
+endif

 # Make sure we have something in REV and REV_NR
 ifeq ($(REV),)
@@ -292,7 +299,7 @@ depend: $(DEPS)

 clean:
 	$(E) '$(STAGE) Cleaning up object files'
-	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(DEPEND) $(TTD:%=$(BIN_DIR)/%) $(BIN_DIR)/baseset/openttd.32.bmp $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS)
+	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(DEPEND) $(TTD:%=$(BIN_DIR)/%) $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS)

 mrproper: clean
 	$(Q)rm -f $(SRC_DIR)/rev.cpp $(SRC_DIR)/os/windows/ottdres.rc
--- a/bin/ai/compat_0.7.nut
+++ b/bin/ai/compat_0.7.nut
@@ -350,20 +350,3 @@ AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
 AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
-AIOrder.AIOF_NONE <- AIOrder.OF_NONE
-AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
-AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
-AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
-AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
-AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
-AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
-AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
-AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
-AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
-AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
-AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
-AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
-AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
-AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
-AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
-AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
--- a/bin/ai/compat_1.0.nut
+++ b/bin/ai/compat_1.0.nut
@@ -102,20 +102,3 @@ AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
 AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
-AIOrder.AIOF_NONE <- AIOrder.OF_NONE
-AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
-AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
-AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
-AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
-AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
-AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
-AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
-AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
-AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
-AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
-AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
-AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
-AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
-AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
-AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
-AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
--- a/bin/ai/compat_1.1.nut
+++ b/bin/ai/compat_1.1.nut
@@ -39,20 +39,3 @@ AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
 AIEvent.AI_ET_TOWN_FOUNDED <- AIEvent.ET_TOWN_FOUNDED;
-AIOrder.AIOF_NONE <- AIOrder.OF_NONE
-AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
-AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
-AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
-AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
-AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
-AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
-AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
-AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
-AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
-AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
-AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
-AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
-AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
-AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
-AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
-AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
--- a/bin/ai/regression/regression.nut
+++ b/bin/ai/regression/regression.nut
@@ -923,12 +923,12 @@ function Regression::Order()
 	print("--Order--");
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(12));
 	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(12, 1));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.OF_TRANSFER));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.OF_TRANSFER | AIOrder.OF_UNLOAD));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.OF_TRANSFER | AIOrder.OF_FULL_LOAD));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.OF_SERVICE_IF_NEEDED));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.OF_STOP_IN_DEPOT));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(0, AIOrder.OF_SERVICE_IF_NEEDED | AIOrder.OF_GOTO_NEAREST_DEPOT));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER | AIOrder.AIOF_UNLOAD));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER | AIOrder.AIOF_FULL_LOAD));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.AIOF_SERVICE_IF_NEEDED));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.AIOF_STOP_IN_DEPOT));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(0, AIOrder.AIOF_SERVICE_IF_NEEDED | AIOrder.AIOF_GOTO_NEAREST_DEPOT));
 	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_LOAD_PERCENTAGE, AIOrder.CF_EQUALS));
 	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_RELIABILITY, AIOrder.CF_IS_TRUE));
 	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_REQUIRES_SERVICE, AIOrder.CF_IS_FALSE));
@@ -940,8 +940,8 @@ function Regression::Order()
 	print("  IsConditionalOrder():  " + AIOrder.IsConditionalOrder(12, 1));
 	print("  IsCurrentOrderPartOfOrderList(): " + AIOrder.IsCurrentOrderPartOfOrderList(12));
 	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 1));
-	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33416, AIOrder.OF_TRANSFER));
-	print("  InsertOrder():         " + AIOrder.InsertOrder(12, 0, 33416, AIOrder.OF_TRANSFER));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33416, AIOrder.AIOF_TRANSFER));
+	print("  InsertOrder():         " + AIOrder.InsertOrder(12, 0, 33416, AIOrder.AIOF_TRANSFER));
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(12));
 	print("  IsValidVehicleOrder(): " + AIOrder.IsValidVehicleOrder(12, 1));
 	print("  IsGotoStationOrder():  " + AIOrder.IsGotoStationOrder(12, 1));
@@ -953,7 +953,7 @@ function Regression::Order()
 	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 1));
 	print("  GetOrderJumpTo():      " + AIOrder.GetOrderJumpTo(12, 1));
 	print("  RemoveOrder():         " + AIOrder.RemoveOrder(12, 0));
-	print("  SetOrderFlags():       " + AIOrder.SetOrderFlags(12, 0, AIOrder.OF_FULL_LOAD));
+	print("  SetOrderFlags():       " + AIOrder.SetOrderFlags(12, 0, AIOrder.AIOF_FULL_LOAD));
 	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 0));
 	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(12, 0));
 	print("  CopyOrders():          " + AIOrder.CopyOrders(12, 1));
@@ -961,12 +961,12 @@ function Regression::Order()
 	print("  ShareOrders():         " + AIOrder.ShareOrders(13, 1));
 	print("  ShareOrders():         " + AIOrder.ShareOrders(13, 12));
 	print("  UnshareOrders():       " + AIOrder.UnshareOrders(13));
-	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33421, AIOrder.OF_NONE));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33421, AIOrder.AIOF_NONE));

 	print("  GetStopLocation():     " + AIOrder.GetStopLocation(13, 0));
 	print("  BuildVehicle():        " + AIVehicle.BuildVehicle(23596, 8));
 	print("  BuildRailStation():    " + AIRail.BuildRailStation(7958, AIRail.RAILTRACK_NE_SW, 1, 1, AIStation.STATION_NEW));
-	print("  AppendOrder():         " + AIOrder.AppendOrder(20, 7958, AIOrder.OF_NONE));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(20, 7958, AIOrder.AIOF_NONE));
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(20));
 	print("  GetStopLocation():     " + AIOrder.GetStopLocation(20, 0));
 	print("  SetStopLocation():     " + AIOrder.SetStopLocation(20, 0, AIOrder.STOPLOCATION_MIDDLE));
--- a/bin/ai/regression/run.sh
+++ b/bin/ai/regression/run.sh
@@ -25,7 +25,7 @@ fi
 if [ -n "$gdb" ]; then
 	$gdb ./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav
 else
-	./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d script=2 -d misc=9 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[script\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' | grep -v '^dbg: \[.*\]' > tmp.regression
+	./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d script=2 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[script\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' > tmp.regression
 fi

 ret=0
--- a/bin/baseset/openttd.grf
+++ b/bin/baseset/openttd.grf
--- a/bin/baseset/opntitle.dat
+++ b/bin/baseset/opntitle.dat
--- a/bin/baseset/orig_dos.obg
+++ b/bin/baseset/orig_dos.obg
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c
+OPENTTD.GRF  = 42d0ea63159d5ef2971429c2402eb2ca

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/bin/baseset/orig_dos_de.obg
+++ b/bin/baseset/orig_dos_de.obg
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c
+OPENTTD.GRF  = 42d0ea63159d5ef2971429c2402eb2ca

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/bin/baseset/orig_win.obg
+++ b/bin/baseset/orig_win.obg
@@ -55,7 +55,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c
+OPENTTD.GRF  = 42d0ea63159d5ef2971429c2402eb2ca

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,170 +1,3 @@
-1.2.0-RC4 (2012-04-01)
------------------------------------------------------------------------
- Fix: Reversing trains while they were entering or leaving a depot could lead to stuck trains [FS#5093] (r24078, r24071)
- Fix: The 'last joined' server was not properly selected anymore [FS#5098] (r24070)
- Fix: Immediately start querying the last joined server instead of waiting for the requery loop [FS#5097] (r24069, r24062)
- Fix: Make the full snowedness level of houses the same as roads and rails [FS#5121] (r24064)
- Fix: With certain versions of GCC and compiler flags the compiler could reorder some code badly causing the 32bpp depot flag not working [FS#5125] (r24063)
- Fix: Do not freeze aircraft mid-flight when skipping to an out-of-range destination [FS#5123] (r24060)
- Fix: Wrong numbering of string parameters causing wrong capacities to be shown [FS#5124] (r24058)
- Fix: Crash when timetabling a maximum travel speed of 0 [FS#5111] (r24053)
- Fix: [NewGRF] Imported GRF sounds were inserted into the wrong slots [FS#5107] (r24052)
- Fix: [NewGRF] Realsprites inside the action 11 block were not skipped correctly (r24050)
- Fix: Improve error messages for the placement restrictions of banks, water towers and toy shops [FS#5095] (r24040)
-
-
-1.2.0-RC3 (2012-03-18)
------------------------------------------------------------------------
- Feature: Allow display of baseset textfiles (r24037)
- Feature: Increase the station class limit from 32 to 256 (r24031)
- Fix: After opening a text window with the monospaced font, all other text started glitching (r24038)
- Fix: [NoAI] Reset 'is random' status of temporary variable during saveload as it is not always written to when loading an AI which means it wouldd be taking the 'is random' setting of another AI (r24033)
- Fix: [NoAI] Make AIEngine::IsArticulated return true if the articulated callback flag is set, do not try to run the callback (r24029)
- Fix: Pass cases down into the list of cargos [FS#5090] (r24024, r24023, r24022)
-
-
-1.2.0-RC2 (2012-03-04)
------------------------------------------------------------------------
- Fix: [Script] AI used in names in API for GSOrder [FS#5088] (r24006)
- Fix: Improve rounding when converting display speeds to internal speeds [FS#5079] (r23995)
- Fix: Also reset the font glyph cache when switching blitters (r23992, r23987)
- Fix: [NewGRF] Also display the cargo subtype for vehicles which have no capacity, but a subtype [FS#5076] (r23991)
- Fix: Zero the offsets of disabled zoomlevels, so they do not influence offset calculations (r23989)
- Fix: Invalid reads when scaling an odd-sized sprite smaller (r23986)
- Fix: Inconsistent quit/abandon/exit game/scenario/editor strings [FS#5074] (r23985)
- Fix: Fix the order of lights on the helipad [FS#5082] (r23984)
- Fix: Tarred heightmaps would not be found [FS#5083] (r23983)
- Fix: Do not load a game during UpdateWindows as that might trigger changing the blitter which triggers re-entrant locking (r23980, r23977)
- Fix: [SDL] Palette update was done too late making switching from 8bpp -> 32bpp look ugly (r23978)
- Fix: Sprites of different zoom levels were not always padded correctly to a common size (r23976)
- Fix: Also save the maximum travel speed for the current vehicle order (r23973)
-
-
-1.2.0-RC1 (2012-02-19)
------------------------------------------------------------------------
- Feature: [NewGRF] Customisable tunnel portals for rail types (r23952)
- Feature: Timetabled maximum travel speeds for non-flying vehicles (r23947)
- Feature: Readme/licence/changelog viewer for AI and game scripts [FS#5047] (r23936)
- Feature: [NewGRF] 32bpp sprites in GRFs (r23897)
- Feature: [NewGRF] Support for RealSprites with multiple zoom levels (r23890)
- Feature: [NewGRF] Support for container version 2 (r23887)
- Fix: Refittability should never depend on the current capacity of a vehicle [FS#5070] (r23965)
- Fix: Do not look for missing sprites twice during startup [FS#5072] (r23963)
- Fix: [Script] Infinite recursion within a script was not caught properly, so they could cause crashes of OpenTTD instead of the AI [FS#5068] (r23962)
- Fix: [NewGRF] Make the properties for always/never refittable cargo types not behave incremental, but reset them on reassignment (r23960)
- Fix: [Network] Do not allow chat messages from pre-active clients. As they have not got the savegame yet, they will not have the interface to send them either (r23958)
- Fix: [Network] Allow sending chat to pre-active clients as the clients start accepting once they send 'map ok' to the server, which is the same moment we change their status to pre-active [FS#4990] (r23957)
- Fix: When the population of a town changes the town view might even have to change size due to different cargo requirements [FS#5062] (r23953)
- Fix: [NoGo] Never show GSGoal::Question() to spectators [FS#5063] (r23950)
- Fix: Better rounding when converting internal speed to displayed speed (r23945)
- Fix: Also list DEITY signs in the signlist in the scenario editor [FS#5061] (r23943)
- Fix: Infrastructure cache of standard road stops would get messed up when buying a company with them (r23942)
- Fix: Scale infrastructure cost of rail tracks by the total number of all tracks and not independently for each rail type (r23931)
- Fix: [Script] Do not close the parameter window when a script starts [FS#4944] (r23930)
- Fix: Do not accelerate, for smoke purposes, when you reached the track's maximum speed [FS#5053]
- Fix: 32bpp animated blitter was optimised a bit too far regarding not needing to update the colour mapping when (re)initialising the palette [FS#5056] (r23927)
- Fix: [NoGo] Some news messages would cause an assertion to be triggered due to a missing proper location for the viewport of the news message, so only allow building when valid data for the viewport is provided or no viewport is used [FS#5054] (r23924)
- Fix: Consider only the middle tile of a lock for lock-infrastructure costs. The other two tiles may be owned by other companies. Also do not count the middle tile of a lock as canal, independent of whether it is build on ground or river slope (r23920)
- Fix: [NewGRF] When determining the first refittable cargotype according to CTT order, do not rely on the GRF assigning the refit_mask property. Also check for GRFs setting the default_cargo or refittable-cargo-classes or -types properties (r23916)
- Fix: [NewGRF] Do not test validity of cargobits using a mask of cargoslots (r23914)
- Fix: [NewGRF] When testing whether a engine shall only carry the default cargo, check ctt_include_mask for being empty before applying cargo translation (r23912)
- Fix: [SDL] Handle the SDL_VIDEOEXPOSE event to solve issues with SDL 1.3 (r23910)
- Fix: [SDL] Fix keyboard-related segfault when compiling against SDL 1.3 (r23909)
- Fix: [Makefile] Make sure bin/baseset/openttd.32.bmp is removed on make clean (r23908)
- Fix: [Makefile] Let "make clean --dry-run" not delete Makefiles (r23907)
- Fix: [Windows installer] OpenMSX got downloaded to and extracted in the wrong (non-existent) folder [FS#5045] (r23905)
- Fix: Memory leak everytime one clicked a savegame in the load GUI (r23901)
- Fix: [NewGRF] It was not possible to import sounds from a NewGRF later in the load order (r23883)
- Remove: PNG sprite loader; use 32bpp sprites in a NewGRF (r23898)
-
-
-1.2.0-beta4 (2012-02-04)
------------------------------------------------------------------------
- Feature: [NewGRF] Give NewGRF defined level crossings and rail depots access to the townzone (r23866)
- Feature: [NewGRF] New algorithm (activated via an engine flag) to determine the capacity of vehicles. This allows vehicles to better control the capacity for cargotypes which they know; and let cargo NewGRFs influence the capacity for cargos the vehicle NewGRF does not know, but which the vehicle is refittable to due to cargo classes (r23861)
- Feature: [NewGRF] Add cargo property 1D to set the capacity multipliers when refitting vehicles, which do not use callback 15 (r23860)
- Feature: Allow command line options -e and -g to be combined to load saves/scenarios directly into SE (r23839)
- Feature: [NoGo] Allow querying orders of vehicles [FS#4994] (r23837)
- Change: Do not let towns (ever) remove objects [FS#5001, FS#5002] (r23842)
- Change: Make signs placed in scenario editor belong to the GS. That way they are always shown in game and are not editable [FS#4999] (r23835)
- Fix: Generate industry subsidies again [FS#5039] (r23876)
- Fix: [NoGo/NoAI] Scripts with a bad comparator could lock up OpenTTD [FS#5004] (r23870)
- Fix: Make the colour of the dropdown items for opening the vehicle list for which the company has no vehicles looking less horrid [FS#5020] (r23867)
- Fix: Railtype overlays were drawn 'only transparent' on invisible bridges (r23864)
- Fix: Inserting conditional orders for ships checked the wrong orders wrt. maximum distance (r23859)
- Fix: Out of bounds read for slowdown parameter caused desync when railtype >= 4, vehicles were fast, and the original acceleration model was used [FS#5007] (r23855)
- Fix: Infrastructure cache could get out of sync when overbuilding a drive through road stop (r23851)
- Fix: When the network is lagging, you try to copy a vehicle's order but accidentally create a station order and then copy the vehicle's order (before the first command is executed) one could trigger an assertion from the pool [FS#5008] (r23849)
- Fix: When removing road or tram from a tram+road stop, the owner of the road stop's cache was updated instead of the owner of the removed infrastructure (r23847)
- Fix: Infrastructure count for stations was not updated properly on company takeover. And do not count buoys while loading a game either (r23844)
- Fix: Clear NewGRF vehicle cache when their owner changes (r23841)
- Fix: Assertion got hit when destroing a dock when a ship was loading [FS#5000] (r23838)
- Fix: If a vehicle is not refittable to any cargo in the CTT, then pick the first refittable cargoslot (r23836)
-
-
-1.2.0-beta3 (2012-01-21)
------------------------------------------------------------------------
- Feature: [NoGo] Allow to chose the goal question window's title from a (small) set of options [FS#4992] (r23827)
- Feature: [NewGRF] Enhance some fatal NewGRF errors with the spritenumber that caused the problem (r23809)
- Fix: Loading empty GS strings/translations failed [FS#4996] (r23829)
- Fix: Return early from SlString() for empty strings, before doing invalid things which surprisingly do not break everything. (r23828)
- Fix: The detailed performance rating window showed the cargo count of the current quarter instead of the last quarter like the tooltip says [FS#4972] (r23826)
- Fix: Removal of towns with 0 population failed during map generation [FS#4951] (r23819)
- Fix: [Network] Desync due to different NewGRF version at client and server [FS#4962] (r23817)
- Fix: [NewGRF] Textstack was not properly used when storing parameters for the error message window [FS#4969] (r23803)
- Fix: Game lobby gui not updated when new company information becomes available [FS#4968] (r23802)
- Fix: Reading the UTF-8 BOM from AI/GS files on big-endian machines failed (r23801)
- Fix: Move 'refitable to' text above custom newgrf text in build vehicle gui [FS#4958] (r23792)
- Fix: [NewGRF] Resize text panel for parameter description if it does not fit in 4 lines [FS#4960] (r23791)
- Fix: [NewGRF] While we can only show one error per NewGRF, fatal errors should always disable the GRF. Also give those errors precedence over other information (r23789)
- Fix: [NewGRF] Failure to load newgrf files that use action 0 general prop 15 with a missing language file (r23788)
- Fix: Crash due to genders used for station name in hangar string of Italian translation [FS#4965] (r23782)
- Fix: Under certain circumstances, e.g. a single invalid order, trying to determine the next order state could end up in an infinite loop [FS#4964] (r23781)
- Fix: [Network] Missing naming of some errors[FS#4963] (r23780)
- Fix: Trim all control codes and the likes from strings being passed into the AI. If the AI would be displaying them later we would be showing those control codes as question marks [FS#4957] (r23778)
- Fix: Hide the PCX screenshot format from the options window, if a 32bpp blitter is used (r23775)
- Fix: [NewGRF] Update all cached train properties if a train vehicle enters a new railtype (r23773)
-
-
-1.2.0-beta2 (2012-01-07)
------------------------------------------------------------------------
- Feature: [NewGRF] Allow read-only display of NewGRF parameters, if GRF list may not be edited (r23760)
- Feature: [NewGRF] Alternate rail type label list (r23758)
- Feature: Make the default secondary sort method for the server list the number of clients instead of the name (r23710)
- Feature: Try harder to sort text instead of fancy characters in the server names (r23709)
- Feature: Make a distinction between fully zoomed in and default zoomed in screenshots [FS#4916] (r23695)
- Feature: Add ability to adjust brightness of colour after remapping for 32bpp sprites (r23670)
- Feature: [GS] GSGoal::Question(), to ask a question to a(ll) company(ies). It can contain random text, and at most 3 buttons from a collection of 17 (r23731)
- Feature: Australian translation (r23730)
- Fix: Make default timeouts for certain network states lower and configurable [CVE-2012-0049] [FS#4955] (r23764)
- Fix: Check whether a water tile is really empty when overbuilding it with an object [FS#4956] (r23763)
- Fix: The check for duplicate town names was not really working [FS#4951] (r23759)
- Fix: Missing locking causing crash is extreme case when being in the MP lobby [FS#4938] (r23752)
- Fix: [Win32] Work around a possible deadlock when initialising threaded drawing (r23749)
- Fix: Make vehicle variables A8 and A9 always return 0. Returning cur_image is a potential desyncer due to Action1 in static NewGRFs (r23748)
- Fix: Also set 'info' to NULL if 'instance' dies (for both AI and GS); avoids invalid memory reads (r23746)
- Fix: If autorefit fails, count the vehicle capacity nevertheless, if it is already carrying the right thing (r23745)
- Fix: [NewGRF] Check the version of the right GRF [FS#4923] (r23744)
- Fix: [NewGRF] Call CB 15E for all vehicles before actually executing any refit [FS#4906] (r23743)
- Fix: Cheating to different climates messes things even more up than changing NewGRFs in-game so it was removed [FS#4939] (r23733)
- Fix: When cheating into another company, the SignList was not updated [FS#4942] (r23728)
- Fix: Reading memory of a temporary (already deconstructed) object is invalid (r23721)
- Fix: [Script] Show the script debug window also when the game script crashes [FS#4935] (r23720)
- Fix: Extraction of music packs failed [FS#4930] (r23719)
- Fix: [AI] Rescanai caused crash when the AI settings of an AI was opened [FS#4936] (r23718)
- Fix: Ships going to wrong dock location when moving the dock while the game is paused [FS#4927] (r23717)
- Fix: The amount of goals was too low [FS#4928] (r23699)
- Fix: Hardcode the original defaults for loading old savegames if they could totally mess with the game's behaviour [FS#4859] (r23693)
- Fix: Infrastructure count of canals/locks/ship depots was not updated properly when a company went into bankruptcy or was taken over [FS#4921] (r23686)
- Fix: When fitting another engine the cargo capacity of wagons could become lower, causing them to contain more than they should. This caused the cargo transfer from the replaced parts to put even more stuff in the already full wagon. Prevent this from happening by reducing the amount of cargo in the vehicle to the capacity when moving vehicles/wagons around, or when autoreplacing [FS#4912] (r23683)
- Fix: Vehicle numbers got misaccounted when autoreplacing failed due to length checks [FS#4914] (r23681)
- Fix: [AI] Prevent removal of the (AI) company the local player is in [FS#4915] (r23680)
- Fix: [Script] Close the editbox of settings when changing an AI, to avoid invalid memory read/write (r23678)
- Fix: [Script] Invalidate AI Parameters window when changing AI [FS#4909] (r23677)
- Fix: When removing road stops the wrong tile was checked for updating the infrastructure cache [FS#4913] (r23676)
- Fix: [Script] The 'Configure' button in the 'AI / Game Configuration' window did not get enabled when activating a GameScript (r23668)
-
-
 1.2.0-beta1 (2011-12-24)
 ------------------------------------------------------------------------
 - Feature: Ability to run a game script; a script that controls some of the logic of the game, e.g. to implement goals or tutorials (r23637)
@@ -315,15 +148,6 @@
 - Fix: Change the centre of train vehicles to depend on the vehicle length instead of being fixed at 4/8th of the original vehicle length to make sure shortened vehicles do not block tiles they should not block [FS#2379,FS#3569] (r23290)


-1.1.5 (2012-01-14)
------------------------------------------------------------------------
- Fix: Make default timeouts for certain network states lower and configurable [CVE-2012-0049] [FS#4955] (r23764)
- Fix: Check whether a water tile is really empty when overbuilding it with an object [FS#4956] (r23763)
- Fix: Missing locking causing crash in extreme case when being in the MP lobby [FS#4938] (r23752)
- Fix: Clear the backed up orders of a removed station as well, otherwise one could create orders to a station that was never in the original backupped orders. For example a road vehicle trying to go to a buoy [FS#4876] (r23464)
- Fix: Do not assume all industries that cut trees have tile (0,0) and wait until all tiles of an industry are completed before starting to cut trees (r23458)
-
-
 1.1.4 (2011-12-05)
 ------------------------------------------------------------------------
 - Fix: Savegames made with the Catalan town name generator would trigger a 'savegame corrupt' exception [FS#4866] (r23418)
--- a/config.lib
+++ b/config.lib
@@ -32,6 +32,7 @@ set_default() {
 	os="DETECT"
 	endian="AUTO"
 	cpu_type="DETECT"
+	revision=""
 	config_log="config.log"
 	prefix_dir="/usr/local"
 	binary_dir="games"
@@ -106,6 +107,7 @@ set_default() {
 		os
 		endian
 		cpu_type
+		revision
 		config_log
 		prefix_dir
 		binary_dir
@@ -197,6 +199,8 @@ detect_params() {
 			--cpu-type)                   prev_p="cpu_type";;
 			--cpu-type=*)                 cpu_type="$optarg";;

+			--revision=*)                 revision="$optarg";;
+
 			--cc-build)                   prevp_p="cc_build";;
 			--cc-build=*)                 cc_build="$optarg";;
 			--cc-host)                    prevp_p="cc_host";;
@@ -1006,15 +1010,31 @@ check_params() {
 		fi
 	fi

-	if [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help 2>/dev/null`" ]; then
+	if [ -n "$revision" ]; then
+		log 1 "checking revision... $revision"
+		log 1 "WARNING: we do not advise you to use this setting"
+		log 1 "WARNING: in most cases it is not safe for network use"
+		log 1 "WARNING: USE WITH CAUTION!"
+
+		sleep 5
+	elif [ -f "$ROOT_DIR/version" ]; then
+		revision="`cat $ROOT_DIR/version`"
+
+		log 1 "checking revision... $revision"
+	elif [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help 2>/dev/null`" ]; then
+		revision=""
 		log 1 "checking revision... svn detection"
 	elif [ -d "$ROOT_DIR/.git" ] && [ -n "`git help 2>/dev/null`" ]; then
+		revision=""
 		log 1 "checking revision... git detection"
 	elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`hg help 2>/dev/null`" ]; then
+		revision=""
 		log 1 "checking revision... hg detection"
 	elif [ -f "$ROOT_DIR/.ottdrev" ]; then
+		revision=""
 		log 1 "checking revision... source tarball"
 	else
+		revision=""
 		log 1 "checking revision... no detection"
 		log 1 "WARNING: there is no means to determine the version."
 		log 1 "WARNING: please use a subversion, mercurial, or git checkout of OpenTTD."
@@ -1159,11 +1179,11 @@ make_compiler_cflags() {
 		if [ -z "$first_time_icc_check" ]; then
 			first_time_icc_check=no
 			if [ $cc_version -lt 90 ]; then
-				log 1 "WARNING: you seem to be using a very old version of ICC"
+				log 1 "WARNING: you seem to be using very old version of ICC"
 				log 1 "WARNING: OpenTTD hasn't been tested with this version"
 				sleep 5
 			elif [ $cc_version -lt 120 ]; then
-				log 1 "WARNING: you seem to be using an unsupported ICC version"
+				log 1 "WARNING: you seem to be using unsupported ICC version"
 				log 1 "WARNING: ICC older than 12.0 is known to fail to compile OpenTTD"
 				sleep 5
 			fi
@@ -1236,58 +1256,6 @@ make_compiler_cflags() {
 				features="$features lto"
 			fi
 		fi
-	elif [ `basename $1 | grep 'clang'` ]; then
-		# Enable some things only for certain clang versions
-		cc_version="`$1 -v 2>&1 | head -n 1 | sed s@[^0-9]@@g | cut -c 1-2`"
-
-		# aliasing rules are not held in openttd code
-		flags="$flags -fno-strict-aliasing"
-
-		# -W alone doesn't enable all warnings enabled by -Wall; on the other hand,
-		# -Weverything enables too many useless warnings that can't be disabled (as of 3.0)
-		flags="$flags -Wall -W"
-
-		# warning: unused parameter '...'
-		flags="$flags -Wno-unused-parameter"
-
-		# warning: expression result unused
-		flags="$flags -Wno-unused-value"
-
-		# warning: multi-character character constant
-		flags="$flags -Wno-multichar"
-
-		# warning: explicitly assigning a variable of type '...' to itself
-		# it happens when using the FOR_ALL_WINDOWS_FROM_BACK_FROM macro
-		flags="$flags -Wno-self-assign"
-
-		if [ "$cc_version" -lt "30" ]; then
-			# warning: equality comparison with extraneous parentheses
-			flags="$flags -Wno-parentheses"
-			# warning: operands of ? are integers of different signs: 'unsigned int' and 'int'
-			flags="$flags -Wno-sign-compare"
-		fi
-
-		if [ "$cc_version" -ge "30" ]; then
-			# warning: equality comparison with extraneous parentheses
-			# this warning could be useful, but it warns about code in squirrel
-			flags="$flags -Wno-parentheses-equality"
-		fi
-
-		if [ "$with_ccache" != "0" -o "$with_distcc" != "0" ]; then
-			# ccache and distcc run separate preprocess and compile passes,
-			# both are fed with the same CFLAGS. Unfortunately, clang
-			# complains about -I when compiling preprocessed files:
-			# "clang: warning: argument unused during compilation: '-I /usr/include'"
-			flags="$flags -Qunused-arguments"
-		fi
-
-		if [ "$enable_assert" -eq "0" ]; then
-			# do not warn about unused variables when building without asserts
-			flags="$flags -Wno-unused-variable"
-		fi
-
-		# rdynamic is used to get useful stack traces from crash reports.
-		ldflags="$ldflags -rdynamic"
 	else
 		# Enable some things only for certain GCC versions
 		cc_version=`$1 -dumpversion | cut -c 1,3`
@@ -3120,9 +3088,9 @@ detect_grfcodec() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"

-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "913" ]; then
-			log 1 "checking grfcodec... needs at least version 5.1.4 (r913), disabled"
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "846" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "846" ]; then
+			log 1 "checking grfcodec... needs at least version 5.1.3 (r846), disabled"
 		else
 			log 1 "checking grfcodec... not found"
 		fi
@@ -3162,9 +3130,9 @@ detect_nforenum() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"

-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "913" ]; then
-			log 1 "checking nforenum... needs at least version 5.1.4 (r913), disabled"
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "846" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "846" ]; then
+			log 1 "checking nforenum... needs at least version 5.1.3 (r846), disabled"
 		else
 			log 1 "checking nforenum... not found"
 		fi
@@ -3277,6 +3245,7 @@ make_sed() {
 		s@!!SRCS!!@$SRCS@g;
 		s@!!OS!!@$os@g;
 		s@!!CONFIGURE_FILES!!@$CONFIGURE_FILES@g;
+		s@!!REVISION!!@$revision@g;
 		s@!!AWK!!@$awk@g;
 		s@!!DISTCC!!@$distcc@g;
 		s@!!NFORENUM!!@$nforenum@g;
@@ -3499,6 +3468,8 @@ showhelp() {
 	echo "                                 MORPHOS/HPUX/BEOS/SUNOS/CYGWIN/MINGW/OS2/"
 	echo "                                 DOS/WINCE/PSP/HAIKU"
 	echo "  --endian=ENDIAN                set the endian of the HOST (AUTO/LE/BE)"
+	echo "  --revision=rXXXX               overwrite the revision detection."
+	echo "                                 Use with care!"
 	echo ""
 	echo "Paths:"
 	echo "  --prefix-dir=dir               specifies the prefix for all installed"
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2012-04-01
-Release version: 1.2.0-RC4
+Last updated:    2011-12-24
+Release version: 1.2.0-beta1
 ------------------------------------------------------------------------


@@ -413,17 +413,3 @@ Not all NewGRFs, AIs, game scripts are found [FS#4887]:
 	tar file is the same as other content on the file system or in another
 	tar file, it is possible that content is not found. A more thorough
 	explanation and solutions are described in section 4.4 of readme.txt.
-
-Mouse cursor going missing with SDL [FS#4997]:
-	Under certain circumstances SDL does not notify OpenTTD of changes
-	with respect to the mouse pointer, specifically whether the mouse
-	pointer is within the bounds of OpenTTD or not. For example, if you
-	Alt-tab to another application the mouse cursor will still be shown
-	in OpenTTD, and when you move the mouse outside of the OpenTTD
-	window so the cursor gets hidden, open/move another application on
-	top of the OpenTTD window and then Alt-tab back into OpenTTD the
-	cursor will not be shown.
-
-	We cannot fix this problem as SDL simply does not provide the
-	required information in these corner cases. This is a bug in SDL
-	and as such there is little that we can do about it.
--- a/media/extra_grf/airport_preview.nfo
+++ b/media/extra_grf/airport_preview.nfo
@@ -8,12 +8,12 @@
 //
   -1 * 0	 0C "Airport previews"
   -1 * 0	 05 16 09
-   -1 sprites/airport_preview.png 8bpp  50    8 230 140   0   0 normal
-   -1 sprites/airport_preview.png 8bpp 290    8 230 140   0   0 normal
-   -1 sprites/airport_preview.png 8bpp 530    8 230 140   0   0 normal
-   -1 sprites/airport_preview.png 8bpp   2  168 230 140   0   0 normal
-   -1 sprites/airport_preview.png 8bpp 242  168 230 140   0   0 normal
-   -1 sprites/airport_preview.png 8bpp 482  168 230 140   0   0 normal
-   -1 sprites/airport_preview.png 8bpp   2  328 230 140   0   0 normal
-   -1 sprites/airport_preview.png 8bpp 242  328 230 140   0   0 normal
-   -1 sprites/airport_preview.png 8bpp 482  328 230 140   0   0 normal
+   -1 sprites/airport_preview.png 50 8 09 140 230 0 0
+   -1 sprites/airport_preview.png 290 8 09 140 230 0 0
+   -1 sprites/airport_preview.png 530 8 09 140 230 0 0
+   -1 sprites/airport_preview.png 2 168 09 140 230 0 0
+   -1 sprites/airport_preview.png 242 168 09 140 230 0 0
+   -1 sprites/airport_preview.png 482 168 09 140 230 0 0
+   -1 sprites/airport_preview.png 2 328 09 140 230 0 0
+   -1 sprites/airport_preview.png 242 328 09 140 230 0 0
+   -1 sprites/airport_preview.png 482 328 09 140 230 0 0
--- a/media/extra_grf/airports.nfo
+++ b/media/extra_grf/airports.nfo
@@ -8,18 +8,18 @@
 //
   -1 * 0	 0C "Extra airport graphics"
   -1 * 3	 05 10 0F
-   -1 sprites/airports.png 8bpp  18    8  64  31 -31   0 normal
-   -1 sprites/airports.png 8bpp  98    8  64  31 -31   0 normal
-   -1 sprites/airports.png 8bpp 178    8  64  31 -31   0 normal
-   -1 sprites/airports.png 8bpp 258    8  64  31 -31   0 normal
-   -1 sprites/airports.png 8bpp 338    8  64  31 -31   0 normal
-   -1 sprites/airports.png 8bpp 418    8  64  31 -31   0 normal
-   -1 sprites/airports.png 8bpp 498    8  64  55  -2 -38 normal
-   -1 sprites/airports.png 8bpp 578    8  18  17  16  -1 normal
-   -1 sprites/airports.png 8bpp 610    8  64  55  -2 -38 normal
-   -1 sprites/airports.png 8bpp 690    8  18  17 -30   1 normal
-   -1 sprites/airports.png 8bpp 722    8  64  55  -2 -38 normal
-   -1 sprites/airports.png 8bpp   2   88  64  55  -2 -38 normal
-   -1 sprites/airports.png 8bpp  82   88  64  31 -31   0 normal
-   -1 sprites/airports.png 8bpp 162   88  64  31 -31   0 normal
-   -1 sprites/airports.png 8bpp 242   88  64  31 -31   0 normal
+   -1 sprites/airports.png 18 8 09 31 64 -31 0
+   -1 sprites/airports.png 98 8 09 31 64 -31 0
+   -1 sprites/airports.png 178 8 09 31 64 -31 0
+   -1 sprites/airports.png 258 8 09 31 64 -31 0
+   -1 sprites/airports.png 338 8 09 31 64 -31 0
+   -1 sprites/airports.png 418 8 09 31 64 -31 0
+   -1 sprites/airports.png 498 8 09 55 64 -2 -38
+   -1 sprites/airports.png 578 8 09 17 18 16 -1
+   -1 sprites/airports.png 610 8 09 55 64 -2 -38
+   -1 sprites/airports.png 690 8 09 17 18 -30 1
+   -1 sprites/airports.png 722 8 09 55 64 -2 -38
+   -1 sprites/airports.png 2 88 09 55 64 -2 -38
+   -1 sprites/airports.png 82 88 09 31 64 -31 0
+   -1 sprites/airports.png 162 88 09 31 64 -31 0
+   -1 sprites/airports.png 242 88 09 31 64 -31 0
--- a/media/extra_grf/aqueduct.nfo
+++ b/media/extra_grf/aqueduct.nfo
@@ -10,22 +10,22 @@
 // temperate aqueduct
   -1 * 6	 07 83 01 \7! 00 09
   -1 * 3	 05 12 08
-   -1 sprites/aqueduct.png 8bpp  34    8  61  32 -30  -9 normal
-   -1 sprites/aqueduct.png 8bpp 114    8  62  31 -29  -9 normal
-   -1 sprites/aqueduct.png 8bpp 194    8  61  32 -30  -9 normal
-   -1 sprites/aqueduct.png 8bpp 274    8  62  31 -29  -9 normal
-   -1 sprites/aqueduct.png 8bpp 354    8  61  32 -30  -4 normal
-   -1 sprites/aqueduct.png 8bpp 434    8  62  31 -29  -4 normal
-   -1 sprites/aqueduct.png 8bpp 514    8  33  23 -31   0 normal
-   -1 sprites/aqueduct.png 8bpp 562    8  33  23   0   1 normal
+   -1 sprites/aqueduct.png  34  8 09 32 61 -30 -9
+   -1 sprites/aqueduct.png 114  8 09 31 62 -29 -9
+   -1 sprites/aqueduct.png 194  8 09 32 61 -30 -9
+   -1 sprites/aqueduct.png 274  8 09 31 62 -29 -9
+   -1 sprites/aqueduct.png 354  8 09 32 61 -30 -4
+   -1 sprites/aqueduct.png 434  8 09 31 62 -29 -4
+   -1 sprites/aqueduct.png 514  8 09 23 33 -31  0
+   -1 sprites/aqueduct.png 562  8 09 23 33   0  1
 // non-temperate aqueduct
   -1 * 6	 07 83 01 \7= 00 09
   -1 * 3	 05 12 08
-   -1 sprites/aqueduct.png 8bpp  34   48  61  32 -30  -9 normal
-   -1 sprites/aqueduct.png 8bpp 114   48  62  31 -29  -9 normal
-   -1 sprites/aqueduct.png 8bpp 194   48  61  32 -30  -9 normal
-   -1 sprites/aqueduct.png 8bpp 274   48  62  31 -29  -9 normal
-   -1 sprites/aqueduct.png 8bpp 354   48  61  32 -30  -4 normal
-   -1 sprites/aqueduct.png 8bpp 434   48  62  31 -29  -4 normal
-   -1 sprites/aqueduct.png 8bpp 514   48  33  23 -31   0 normal
-   -1 sprites/aqueduct.png 8bpp 562   48  33  23   0   1 normal
+   -1 sprites/aqueduct.png  34 48 09 32 61 -30 -9
+   -1 sprites/aqueduct.png 114 48 09 31 62 -29 -9
+   -1 sprites/aqueduct.png 194 48 09 32 61 -30 -9
+   -1 sprites/aqueduct.png 274 48 09 31 62 -29 -9
+   -1 sprites/aqueduct.png 354 48 09 32 61 -30 -4
+   -1 sprites/aqueduct.png 434 48 09 31 62 -29 -4
+   -1 sprites/aqueduct.png 514 48 09 23 33 -31  0
+   -1 sprites/aqueduct.png 562 48 09 23 33   0  1
--- a/media/extra_grf/autorail.nfo
+++ b/media/extra_grf/autorail.nfo
@@ -8,58 +8,58 @@
 //
   -1 * 0	 0C "Autorail graphics"
   -1 * 3	 05 13 37
-   -1 sprites/autorail.png 8bpp  18    8  64  31 -31   7 normal
-   -1 sprites/autorail.png 8bpp  98    8  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 178    8  64  39 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 258    8  64  47 -31  -9 normal
-   -1 sprites/autorail.png 8bpp 338    8  64  31 -31  -5 normal
-   -1 sprites/autorail.png 8bpp 418    8  64  23 -31   7 normal
-   -1 sprites/autorail.png 8bpp 498    8  64  18 -31   4 normal
-   -1 sprites/autorail.png 8bpp 578    8  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 658    8  64  31 -31   7 normal
-   -1 sprites/autorail.png 8bpp   2   72  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp  82   72  64  23 -31   7 normal
-   -1 sprites/autorail.png 8bpp 162   72  64  18 -31   4 normal
-   -1 sprites/autorail.png 8bpp 242   72  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 322   72  64  39 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 402   72  64  47 -31  -9 normal
-   -1 sprites/autorail.png 8bpp 482   72  64  31 -31  -5 normal
-   -1 sprites/autorail.png 8bpp 562   72  64  31 -31   7 normal
-   -1 sprites/autorail.png 8bpp 642   72  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 722   72  64  47 -31  -9 normal
-   -1 sprites/autorail.png 8bpp   2  136  64  26 -31   4 normal
-   -1 sprites/autorail.png 8bpp  82  136  64  23 -31   4 normal
-   -1 sprites/autorail.png 8bpp 162  136  64  31 -31  -3 normal
-   -1 sprites/autorail.png 8bpp 242  136  64  26 -31   4 normal
-   -1 sprites/autorail.png 8bpp 322  136  64  23 -31   4 normal
-   -1 sprites/autorail.png 8bpp 402  136  64  31 -31  -3 normal
-   -1 sprites/autorail.png 8bpp 482  136  64  31 -31   7 normal
-   -1 sprites/autorail.png 8bpp 562  136  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 642  136  64  15 -31   7 normal
-   -1 sprites/autorail.png 8bpp 722  136  64  31 -31   7 normal
-   -1 sprites/autorail.png 8bpp   2  184  64  39 -31  -1 normal
-   -1 sprites/autorail.png 8bpp  82  184  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 162  184  64  31 -31   7 normal
-   -1 sprites/autorail.png 8bpp 242  184  64  39 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 322  184  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 402  184  64  31 -31   7 normal
-   -1 sprites/autorail.png 8bpp 482  184  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 562  184  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 642  184  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 722  184  64  23 -31   7 normal
-   -1 sprites/autorail.png 8bpp   2  248  64  15 -31   7 normal
-   -1 sprites/autorail.png 8bpp  82  248  64  39 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 162  248  64  47 -31  -9 normal
-   -1 sprites/autorail.png 8bpp 242  248  64  31 -31   7 normal
-   -1 sprites/autorail.png 8bpp 322  248  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 402  248  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 482  248  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 562  248  64  23 -31   7 normal
-   -1 sprites/autorail.png 8bpp 642  248  64  15 -31   7 normal
-   -1 sprites/autorail.png 8bpp 722  248  64  39 -31  -1 normal
-   -1 sprites/autorail.png 8bpp   2  312  64  47 -31  -9 normal
-   -1 sprites/autorail.png 8bpp  82  312  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 162  312  64  31 -31  -1 normal
-   -1 sprites/autorail.png 8bpp 242  312  64  23 -31   7 normal
-   -1 sprites/autorail.png 8bpp 322  312  64  31 -31   7 normal
-   -1 sprites/autorail.png 8bpp 402  312  64  31 -31   7 normal
+   -1 sprites/autorail.png 18 8 09 31 64 -31 7
+   -1 sprites/autorail.png 98 8 09 31 64 -31 -1
+   -1 sprites/autorail.png 178 8 09 39 64 -31 -1
+   -1 sprites/autorail.png 258 8 09 47 64 -31 -9
+   -1 sprites/autorail.png 338 8 09 31 64 -31 -5
+   -1 sprites/autorail.png 418 8 09 23 64 -31 7
+   -1 sprites/autorail.png 498 8 09 18 64 -31 4
+   -1 sprites/autorail.png 578 8 09 31 64 -31 -1
+   -1 sprites/autorail.png 658 8 09 31 64 -31 7
+   -1 sprites/autorail.png 2 72 09 31 64 -31 -1
+   -1 sprites/autorail.png 82 72 09 23 64 -31 7
+   -1 sprites/autorail.png 162 72 09 18 64 -31 4
+   -1 sprites/autorail.png 242 72 09 31 64 -31 -1
+   -1 sprites/autorail.png 322 72 09 39 64 -31 -1
+   -1 sprites/autorail.png 402 72 09 47 64 -31 -9
+   -1 sprites/autorail.png 482 72 09 31 64 -31 -5
+   -1 sprites/autorail.png 562 72 09 31 64 -31 7
+   -1 sprites/autorail.png 642 72 09 31 64 -31 -1
+   -1 sprites/autorail.png 722 72 09 47 64 -31 -9
+   -1 sprites/autorail.png 2 136 09 26 64 -31 4
+   -1 sprites/autorail.png 82 136 09 23 64 -31 4
+   -1 sprites/autorail.png 162 136 09 31 64 -31 -3
+   -1 sprites/autorail.png 242 136 09 26 64 -31 4
+   -1 sprites/autorail.png 322 136 09 23 64 -31 4
+   -1 sprites/autorail.png 402 136 09 31 64 -31 -3
+   -1 sprites/autorail.png 482 136 09 31 64 -31 7
+   -1 sprites/autorail.png 562 136 09 31 64 -31 -1
+   -1 sprites/autorail.png 642 136 09 15 64 -31 7
+   -1 sprites/autorail.png 722 136 09 31 64 -31 7
+   -1 sprites/autorail.png 2 184 09 39 64 -31 -1
+   -1 sprites/autorail.png 82 184 09 31 64 -31 -1
+   -1 sprites/autorail.png 162 184 09 31 64 -31 7
+   -1 sprites/autorail.png 242 184 09 39 64 -31 -1
+   -1 sprites/autorail.png 322 184 09 31 64 -31 -1
+   -1 sprites/autorail.png 402 184 09 31 64 -31 7
+   -1 sprites/autorail.png 482 184 09 31 64 -31 -1
+   -1 sprites/autorail.png 562 184 09 31 64 -31 -1
+   -1 sprites/autorail.png 642 184 09 31 64 -31 -1
+   -1 sprites/autorail.png 722 184 09 23 64 -31 7
+   -1 sprites/autorail.png 2 248 09 15 64 -31 7
+   -1 sprites/autorail.png 82 248 09 39 64 -31 -1
+   -1 sprites/autorail.png 162 248 09 47 64 -31 -9
+   -1 sprites/autorail.png 242 248 09 31 64 -31 7
+   -1 sprites/autorail.png 322 248 09 31 64 -31 -1
+   -1 sprites/autorail.png 402 248 09 31 64 -31 -1
+   -1 sprites/autorail.png 482 248 09 31 64 -31 -1
+   -1 sprites/autorail.png 562 248 09 23 64 -31 7
+   -1 sprites/autorail.png 642 248 09 15 64 -31 7
+   -1 sprites/autorail.png 722 248 09 39 64 -31 -1
+   -1 sprites/autorail.png 2 312 09 47 64 -31 -9
+   -1 sprites/autorail.png 82 312 09 31 64 -31 -1
+   -1 sprites/autorail.png 162 312 09 31 64 -31 -1
+   -1 sprites/autorail.png 242 312 09 23 64 -31 7
+   -1 sprites/autorail.png 322 312 09 31 64 -31 7
+   -1 sprites/autorail.png 402 312 09 31 64 -31 7
--- a/media/extra_grf/canals.nfo
+++ b/media/extra_grf/canals.nfo
@@ -9,107 +9,107 @@
   -1 * 0	 0C "Canal graphics by George / PaulC"
   -1 * 3	 05 08 41
 // Canal slopes
-   -1 sprites/canal_locks.png 8bpp  66    8  64  23 -31   0 normal
-   -1 sprites/canal_locks.png 8bpp 146    8  64  39 -31  -8 normal
-   -1 sprites/canal_locks.png 8bpp 226    8  64  23 -31   0 normal
-   -1 sprites/canal_locks.png 8bpp 306    8  64  39 -31  -8 normal
+   -1 sprites/canal_locks.png 66 8 09 23 64 -31 0
+   -1 sprites/canal_locks.png 146 8 09 39 64 -31 -8
+   -1 sprites/canal_locks.png 226 8 09 23 64 -31 0
+   -1 sprites/canal_locks.png 306 8 09 39 64 -31 -8
 // Lock sides
-   -1 sprites/canal_locks.png 8bpp 386    8  40  26  -7 -12 normal
-   -1 sprites/canal_locks.png 8bpp 434    8  42  33 -31 -13 normal
-   -1 sprites/canal_locks.png 8bpp 482    8  40  25 -31 -12 normal
-   -1 sprites/canal_locks.png 8bpp 530    8  42  34  -9 -14 normal
-   -1 sprites/canal_locks.png 8bpp 578    8  32  27  -1 -17 normal
-   -1 sprites/canal_locks.png 8bpp 626    8  32  35 -29 -17 normal
-   -1 sprites/canal_locks.png 8bpp 674    8  32  27 -29 -17 normal
-   -1 sprites/canal_locks.png 8bpp 722    8  32  35  -1 -17 normal
-   -1 sprites/canal_locks.png 8bpp   2   72  40  44  -7 -24 normal
-   -1 sprites/canal_locks.png 8bpp  50   72  42  33 -31 -13 normal
-   -1 sprites/canal_locks.png 8bpp  98   72  40  32 -31 -12 normal
-   -1 sprites/canal_locks.png 8bpp 146   72  41  31  -8 -12 normal
-   -1 sprites/canal_locks.png 8bpp 194   72  34  32  -1 -13 normal
-   -1 sprites/canal_locks.png 8bpp 242   72  38  34 -35 -17 normal
-   -1 sprites/canal_locks.png 8bpp 290   72  34  44 -29 -26 normal
-   -1 sprites/canal_locks.png 8bpp 338   72  38  34  -1 -17 normal
-   -1 sprites/canal_locks.png 8bpp 386   72  42  24  -9  -4 normal
-   -1 sprites/canal_locks.png 8bpp 434   72  43  24 -31  -4 normal
-   -1 sprites/canal_locks.png 8bpp 482   72  53  24 -31  -4 normal
-   -1 sprites/canal_locks.png 8bpp 546   72  43  37 -10 -16 normal
-   -1 sprites/canal_locks.png 8bpp 594   72  38  26  -1  -9 normal
-   -1 sprites/canal_locks.png 8bpp 642   72  34  37 -29 -18 normal
-   -1 sprites/canal_locks.png 8bpp 690   72  38  26 -35  -9 normal
-   -1 sprites/canal_locks.png 8bpp 738   72  32  23  -1  -5 normal
-   -1 sprites/canal_locks.png 8bpp   2  136  40  26  -7 -12 normal
-   -1 sprites/canal_locks.png 8bpp  50  136  42  33 -31 -13 normal
-   -1 sprites/canal_locks.png 8bpp  98  136  40  25 -31 -12 normal
-   -1 sprites/canal_locks.png 8bpp 146  136  42  34  -9 -14 normal
-   -1 sprites/canal_locks.png 8bpp 194  136  32  27  -1 -17 normal
-   -1 sprites/canal_locks.png 8bpp 242  136  32  35 -29 -17 normal
-   -1 sprites/canal_locks.png 8bpp 290  136  32  27 -29 -17 normal
-   -1 sprites/canal_locks.png 8bpp 338  136  32  35  -1 -17 normal
-   -1 sprites/canal_locks.png 8bpp 386  136  40  32  -7 -12 normal
-   -1 sprites/canal_locks.png 8bpp 434  136  42  33 -31 -13 normal
-   -1 sprites/canal_locks.png 8bpp 482  136  40  32 -31 -12 normal
-   -1 sprites/canal_locks.png 8bpp 530  136  41  31  -8 -12 normal
-   -1 sprites/canal_locks.png 8bpp 578  136  34  32  -1 -13 normal
-   -1 sprites/canal_locks.png 8bpp 626  136  38  34 -35 -17 normal
-   -1 sprites/canal_locks.png 8bpp 674  136  34  32 -29 -14 normal
-   -1 sprites/canal_locks.png 8bpp 722  136  38  34  -1 -17 normal
-   -1 sprites/canal_locks.png 8bpp   2  184  42  24  -9  -4 normal
-   -1 sprites/canal_locks.png 8bpp  50  184  43  24 -31  -4 normal
-   -1 sprites/canal_locks.png 8bpp  98  184  53  24 -31  -4 normal
-   -1 sprites/canal_locks.png 8bpp 162  184  43  25 -10  -4 normal
-   -1 sprites/canal_locks.png 8bpp 210  184  38  26  -1  -9 normal
-   -1 sprites/canal_locks.png 8bpp 258  184  34  25 -29  -6 normal
-   -1 sprites/canal_locks.png 8bpp 306  184  38  26 -35  -9 normal
-   -1 sprites/canal_locks.png 8bpp 354  184  32  23  -1  -5 normal
+   -1 sprites/canal_locks.png 386 8 09 26 40 -7 -12
+   -1 sprites/canal_locks.png 434 8 09 33 42 -31 -13
+   -1 sprites/canal_locks.png 482 8 09 25 40 -31 -12
+   -1 sprites/canal_locks.png 530 8 09 34 42 -9 -14
+   -1 sprites/canal_locks.png 578 8 09 27 32 -1 -17
+   -1 sprites/canal_locks.png 626 8 09 35 32 -29 -17
+   -1 sprites/canal_locks.png 674 8 09 27 32 -29 -17
+   -1 sprites/canal_locks.png 722 8 09 35 32 -1 -17
+   -1 sprites/canal_locks.png 2 72 09 44 40 -7 -24
+   -1 sprites/canal_locks.png 50 72 09 33 42 -31 -13
+   -1 sprites/canal_locks.png 98 72 09 32 40 -31 -12
+   -1 sprites/canal_locks.png 146 72 09 31 41 -8 -12
+   -1 sprites/canal_locks.png 194 72 09 32 34 -1 -13
+   -1 sprites/canal_locks.png 242 72 09 34 38 -35 -17
+   -1 sprites/canal_locks.png 290 72 09 44 34 -29 -26
+   -1 sprites/canal_locks.png 338 72 09 34 38 -1 -17
+   -1 sprites/canal_locks.png 386 72 09 24 42 -9 -4
+   -1 sprites/canal_locks.png 434 72 09 24 43 -31 -4
+   -1 sprites/canal_locks.png 482 72 09 24 53 -31 -4
+   -1 sprites/canal_locks.png 546 72 09 37 43 -10 -16
+   -1 sprites/canal_locks.png 594 72 09 26 38 -1 -9
+   -1 sprites/canal_locks.png 642 72 09 37 34 -29 -18
+   -1 sprites/canal_locks.png 690 72 09 26 38 -35 -9
+   -1 sprites/canal_locks.png 738 72 09 23 32 -1 -5
+   -1 sprites/canal_locks.png 2 136 09 26 40 -7 -12
+   -1 sprites/canal_locks.png 50 136 09 33 42 -31 -13
+   -1 sprites/canal_locks.png 98 136 09 25 40 -31 -12
+   -1 sprites/canal_locks.png 146 136 09 34 42 -9 -14
+   -1 sprites/canal_locks.png 194 136 09 27 32 -1 -17
+   -1 sprites/canal_locks.png 242 136 09 35 32 -29 -17
+   -1 sprites/canal_locks.png 290 136 09 27 32 -29 -17
+   -1 sprites/canal_locks.png 338 136 09 35 32 -1 -17
+   -1 sprites/canal_locks.png 386 136 09 32 40 -7 -12
+   -1 sprites/canal_locks.png 434 136 09 33 42 -31 -13
+   -1 sprites/canal_locks.png 482 136 09 32 40 -31 -12
+   -1 sprites/canal_locks.png 530 136 09 31 41 -8 -12
+   -1 sprites/canal_locks.png 578 136 09 32 34 -1 -13
+   -1 sprites/canal_locks.png 626 136 09 34 38 -35 -17
+   -1 sprites/canal_locks.png 674 136 09 32 34 -29 -14
+   -1 sprites/canal_locks.png 722 136 09 34 38 -1 -17
+   -1 sprites/canal_locks.png 2 184 09 24 42 -9 -4
+   -1 sprites/canal_locks.png 50 184 09 24 43 -31 -4
+   -1 sprites/canal_locks.png 98 184 09 24 53 -31 -4
+   -1 sprites/canal_locks.png 162 184 09 25 43 -10 -4
+   -1 sprites/canal_locks.png 210 184 09 26 38 -1 -9
+   -1 sprites/canal_locks.png 258 184 09 25 34 -29 -6
+   -1 sprites/canal_locks.png 306 184 09 26 38 -35 -9
+   -1 sprites/canal_locks.png 354 184 09 23 32 -1 -5
 // Canal edges (temperate)
-   -1 sprites/canals.png 8bpp  30   10  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94   10  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142   10  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190   10  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238   10  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270   10  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302   10  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334   10  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366   10  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398   10  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430   10  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446   10  24  16 -11  -6 normal
+   -1 sprites/canals.png  30  10 09 22 45 -11 -1
+   -1 sprites/canals.png  94  10 09 21 41  -8 10
+   -1 sprites/canals.png 142  10 09 21 42 -31 10
+   -1 sprites/canals.png 190  10 09 22 43 -31 -1
+   -1 sprites/canals.png 238  10 09 22 22  11  4
+   -1 sprites/canals.png 270  10 09 16 24 -11 15
+   -1 sprites/canals.png 302  10 09 23 23 -31  4
+   -1 sprites/canals.png 334  10 09 18 24 -11 -1
+   -1 sprites/canals.png 366  10 09 11 12  21 10
+   -1 sprites/canals.png 398  10 09 10 19  -8 21
+   -1 sprites/canals.png 430  10 09 10 11 -31 10
+   -1 sprites/canals.png 446  10 09 16 24 -11 -6
 // Canal icon
-   -1 sprites/canal_locks.png 8bpp  50  232  20  20   0   0 normal
+   -1 sprites/canal_locks.png 50 232 09 20 20 0 0

 // Differentiation for the climates starts here

 // Canal edges (arctic snowy)
   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30   40  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94   40  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142   40  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190   40  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238   40  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270   40  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302   40  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334   40  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366   40  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398   40  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430   40  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446   40  24  16 -11  -6 normal
+   -1 sprites/canals.png  30  40 09 22 45 -11 -1
+   -1 sprites/canals.png  94  40 09 21 41  -8 10
+   -1 sprites/canals.png 142  40 09 21 42 -31 10
+   -1 sprites/canals.png 190  40 09 22 43 -31 -1
+   -1 sprites/canals.png 238  40 09 22 22  11  4
+   -1 sprites/canals.png 270  40 09 16 24 -11 15
+   -1 sprites/canals.png 302  40 09 23 23 -31  4
+   -1 sprites/canals.png 334  40 09 18 24 -11 -1
+   -1 sprites/canals.png 366  40 09 11 12  21 10
+   -1 sprites/canals.png 398  40 09 10 19  -8 21
+   -1 sprites/canals.png 430  40 09 10 11 -31 10
+   -1 sprites/canals.png 446  40 09 16 24 -11 -6
   -1 * 7        02 05 10 01 00 00 00

 // Canal edges (arctic normal)
   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30   70  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94   70  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142   70  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190   70  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238   70  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270   70  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302   70  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334   70  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366   70  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398   70  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430   70  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446   70  24  16 -11  -6 normal
+   -1 sprites/canals.png  30  70 09 22 45 -11 -1
+   -1 sprites/canals.png  94  70 09 21 41  -8 10
+   -1 sprites/canals.png 142  70 09 21 42 -31 10
+   -1 sprites/canals.png 190  70 09 22 43 -31 -1
+   -1 sprites/canals.png 238  70 09 22 22  11  4
+   -1 sprites/canals.png 270  70 09 16 24 -11 15
+   -1 sprites/canals.png 302  70 09 23 23 -31  4
+   -1 sprites/canals.png 334  70 09 18 24 -11 -1
+   -1 sprites/canals.png 366  70 09 11 12  21 10
+   -1 sprites/canals.png 398  70 09 10 19  -8 21
+   -1 sprites/canals.png 430  70 09 10 11 -31 10
+   -1 sprites/canals.png 446  70 09 16 24 -11 -6
   -1 * 7        02 05 11 01 00 00 00
 // Choose the right arctic canal edges
   -1 * 14       02 05 12 81 81 00 FF 01 10 00 04 04 11 00
@@ -118,34 +118,34 @@

 // Canal edges (tropic desert)
   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30  100  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94  100  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142  100  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190  100  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238  100  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270  100  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302  100  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334  100  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366  100  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398  100  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430  100  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446  100  24  16 -11  -6 normal
+   -1 sprites/canals.png  30 100 09 22 45 -11 -1
+   -1 sprites/canals.png  94 100 09 21 41  -8 10
+   -1 sprites/canals.png 142 100 09 21 42 -31 10
+   -1 sprites/canals.png 190 100 09 22 43 -31 -1
+   -1 sprites/canals.png 238 100 09 22 22  11  4
+   -1 sprites/canals.png 270 100 09 16 24 -11 15
+   -1 sprites/canals.png 302 100 09 23 23 -31  4
+   -1 sprites/canals.png 334 100 09 18 24 -11 -1
+   -1 sprites/canals.png 366 100 09 11 12  21 10
+   -1 sprites/canals.png 398 100 09 10 19  -8 21
+   -1 sprites/canals.png 430 100 09 10 11 -31 10
+   -1 sprites/canals.png 446 100 09 16 24 -11 -6
   -1 * 7        02 05 13 01 00 00 00

 // Canal edges (tropic rainforest)
   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30  130  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94  130  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142  130  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190  130  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238  130  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270  130  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302  130  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334  130  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366  130  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398  130  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430  130  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446  130  24  16 -11  -6 normal
+   -1 sprites/canals.png  30 130 09 22 45 -11 -1
+   -1 sprites/canals.png  94 130 09 21 41  -8 10
+   -1 sprites/canals.png 142 130 09 21 42 -31 10
+   -1 sprites/canals.png 190 130 09 22 43 -31 -1
+   -1 sprites/canals.png 238 130 09 22 22  11  4
+   -1 sprites/canals.png 270 130 09 16 24 -11 15
+   -1 sprites/canals.png 302 130 09 23 23 -31  4
+   -1 sprites/canals.png 334 130 09 18 24 -11 -1
+   -1 sprites/canals.png 366 130 09 11 12  21 10
+   -1 sprites/canals.png 398 130 09 10 19  -8 21
+   -1 sprites/canals.png 430 130 09 10 11 -31 10
+   -1 sprites/canals.png 446 130 09 16 24 -11 -6
   -1 * 7        02 05 14 01 00 00 00
 // Choose the right tropic canal edges
   -1 * 14       02 05 15 81 81 00 FF 01 13 00 01 01 14 00
@@ -154,18 +154,18 @@

 // Canal edges (toyland)
   -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png 8bpp  30  160  45  22 -11  -1 normal
-   -1 sprites/canals.png 8bpp  94  160  41  21  -8  10 normal
-   -1 sprites/canals.png 8bpp 142  160  42  21 -31  10 normal
-   -1 sprites/canals.png 8bpp 190  160  43  22 -31  -1 normal
-   -1 sprites/canals.png 8bpp 238  160  22  22  11   4 normal
-   -1 sprites/canals.png 8bpp 270  160  24  16 -11  15 normal
-   -1 sprites/canals.png 8bpp 302  160  23  23 -31   4 normal
-   -1 sprites/canals.png 8bpp 334  160  24  18 -11  -1 normal
-   -1 sprites/canals.png 8bpp 366  160  12  11  21  10 normal
-   -1 sprites/canals.png 8bpp 398  160  19  10  -8  21 normal
-   -1 sprites/canals.png 8bpp 430  160  11  10 -31  10 normal
-   -1 sprites/canals.png 8bpp 446  160  24  16 -11  -6 normal
+   -1 sprites/canals.png  30 160 09 22 45 -11 -1
+   -1 sprites/canals.png  94 160 09 21 41  -8 10
+   -1 sprites/canals.png 142 160 09 21 42 -31 10
+   -1 sprites/canals.png 190 160 09 22 43 -31 -1
+   -1 sprites/canals.png 238 160 09 22 22  11  4
+   -1 sprites/canals.png 270 160 09 16 24 -11 15
+   -1 sprites/canals.png 302 160 09 23 23 -31  4
+   -1 sprites/canals.png 334 160 09 18 24 -11 -1
+   -1 sprites/canals.png 366 160 09 11 12  21 10
+   -1 sprites/canals.png 398 160 09 10 19  -8 21
+   -1 sprites/canals.png 430 160 09 10 11 -31 10
+   -1 sprites/canals.png 446 160 09 16 24 -11 -6
   -1 * 7        02 05 16 01 00 00 00
   -1 * 6        07 83 01 \7! 03 01
   -1 * 7        03 05 01 02 00 16 00
--- a/media/extra_grf/chars.nfo
+++ b/media/extra_grf/chars.nfo
--- a/media/extra_grf/chars.png
+++ b/media/extra_grf/chars.png
--- a/media/extra_grf/elrails.nfo
+++ b/media/extra_grf/elrails.nfo
@@ -8,51 +8,51 @@
 //
   -1 * 0	 0C "Electrified rail by Michael Blunck"
   -1 * 3	 05 05 30
-   -1 sprites/elrails.png 8bpp  66    8  32  16 -29  -2 normal
-   -1 sprites/elrails.png 8bpp 114    8  32  16  -1  -2 normal
-   -1 sprites/elrails.png 8bpp 162    8  32   1  -1  -2 normal
-   -1 sprites/elrails.png 8bpp 210    8   1  16   0  -3 normal
-   -1 sprites/elrails.png 8bpp 226    8  32  24 -29  -2 normal
-   -1 sprites/elrails.png 8bpp 274    8  32   9  -1   6 normal
-   -1 sprites/elrails.png 8bpp 322    8  32   9 -29   6 normal
-   -1 sprites/elrails.png 8bpp 370    8  32  24  -1  -2 normal
-   -1 sprites/elrails.png 8bpp 418    8  32  16 -29  -2 normal
-   -1 sprites/elrails.png 8bpp 466    8  32  16  -1  -2 normal
-   -1 sprites/elrails.png 8bpp 514    8  32   1  -1  -2 normal
-   -1 sprites/elrails.png 8bpp 562    8   1  16   0  -3 normal
-   -1 sprites/elrails.png 8bpp 578    8  32  24 -29  -2 normal
-   -1 sprites/elrails.png 8bpp 626    8  32   9  -1   6 normal
-   -1 sprites/elrails.png 8bpp 674    8  32   9 -29   6 normal
-   -1 sprites/elrails.png 8bpp 722    8  32  24  -1  -2 normal
-   -1 sprites/elrails.png 8bpp   2   56  32  16 -29  -2 normal
-   -1 sprites/elrails.png 8bpp  50   56  32  16  -1  -2 normal
-   -1 sprites/elrails.png 8bpp  98   56  32   1  -1  -2 normal
-   -1 sprites/elrails.png 8bpp 146   56   1  16   0  -3 normal
-   -1 sprites/elrails.png 8bpp 162   56  32  24 -29  -2 normal
-   -1 sprites/elrails.png 8bpp 210   56  32   9  -1   6 normal
-   -1 sprites/elrails.png 8bpp 258   56  32   9 -29   6 normal
-   -1 sprites/elrails.png 8bpp 306   56  32  24  -1  -2 normal
-   -1 sprites/elrails.png 8bpp 354   56  16   8 -29   6 normal
-   -1 sprites/elrails.png 8bpp 386   56  16   8  -1  -2 normal
-   -1 sprites/elrails.png 8bpp 418   56  16   8 -13  -2 normal
-   -1 sprites/elrails.png 8bpp 450   56  16   8  15   6 normal
-   -1 sprites/elrails.png 8bpp 482   56   8  16  -7 -14 normal
-   -1 sprites/elrails.png 8bpp 498   56   8  18   0 -17 normal
-   -1 sprites/elrails.png 8bpp 514   56   8  16   0 -14 normal
-   -1 sprites/elrails.png 8bpp 530   56   8  18  -7 -17 normal
-   -1 sprites/elrails.png 8bpp 546   56   2  16   0 -15 normal
-   -1 sprites/elrails.png 8bpp 562   56   2  18   0 -16 normal
-   -1 sprites/elrails.png 8bpp 578   56   8  16   0 -15 normal
-   -1 sprites/elrails.png 8bpp 594   56   8  16  -7 -15 normal
-   -1 sprites/elrails.png 8bpp 610   56  13  16   4   2 normal
-   -1 sprites/elrails.png 8bpp 642   56  20  16   0   2 normal
-   -1 sprites/elrails.png 8bpp 674   56  20  16   0   2 normal
-   -1 sprites/elrails.png 8bpp 706   56  20  16   0   2 normal
-   -1 sprites/elrails.png 8bpp 738   56  38  30  -3 -14 normal
-   -1 sprites/elrails.png 8bpp   2  104  72  44 -16  -8 normal
-   -1 sprites/elrails.png 8bpp  82  104  44  35 -21  -2 normal
-   -1 sprites/elrails.png 8bpp 146  104  72  44 -16 -35 normal
-   -1 sprites/elrails.png 8bpp 226  104  20  19   0   1 normal
-   -1 sprites/elrails.png 8bpp 258  104  32  32   0   0 normal
-   -1 sprites/elrails.png 8bpp 306  104  12  22  -9 -18 normal
-   -1 sprites/elrails.png 8bpp 338  104  12  22  -1 -18 normal
+   -1 sprites/elrails.png 66 8 01 16 32 -29 -2
+   -1 sprites/elrails.png 114 8 01 16 32 -1 -2
+   -1 sprites/elrails.png 162 8 01 1 32 -1 -2
+   -1 sprites/elrails.png 210 8 01 16 1 0 -3
+   -1 sprites/elrails.png 226 8 01 24 32 -29 -2
+   -1 sprites/elrails.png 274 8 01 9 32 -1 6
+   -1 sprites/elrails.png 322 8 01 9 32 -29 6
+   -1 sprites/elrails.png 370 8 01 24 32 -1 -2
+   -1 sprites/elrails.png 418 8 01 16 32 -29 -2
+   -1 sprites/elrails.png 466 8 01 16 32 -1 -2
+   -1 sprites/elrails.png 514 8 01 1 32 -1 -2
+   -1 sprites/elrails.png 562 8 01 16 1 0 -3
+   -1 sprites/elrails.png 578 8 01 24 32 -29 -2
+   -1 sprites/elrails.png 626 8 01 9 32 -1 6
+   -1 sprites/elrails.png 674 8 01 9 32 -29 6
+   -1 sprites/elrails.png 722 8 01 24 32 -1 -2
+   -1 sprites/elrails.png 2 56 01 16 32 -29 -2
+   -1 sprites/elrails.png 50 56 01 16 32 -1 -2
+   -1 sprites/elrails.png 98 56 01 1 32 -1 -2
+   -1 sprites/elrails.png 146 56 01 16 1 0 -3
+   -1 sprites/elrails.png 162 56 01 24 32 -29 -2
+   -1 sprites/elrails.png 210 56 01 9 32 -1 6
+   -1 sprites/elrails.png 258 56 01 9 32 -29 6
+   -1 sprites/elrails.png 306 56 01 24 32 -1 -2
+   -1 sprites/elrails.png 354 56 01 8 16 -29 6
+   -1 sprites/elrails.png 386 56 01 8 16 -1 -2
+   -1 sprites/elrails.png 418 56 01 8 16 -13 -2
+   -1 sprites/elrails.png 450 56 01 8 16 15 6
+   -1 sprites/elrails.png 482 56 01 16 8 -7 -14
+   -1 sprites/elrails.png 498 56 01 18 8 0 -17
+   -1 sprites/elrails.png 514 56 01 16 8 0 -14
+   -1 sprites/elrails.png 530 56 01 18 8 -7 -17
+   -1 sprites/elrails.png 546 56 01 16 2 0 -15
+   -1 sprites/elrails.png 562 56 01 18 2 0 -16
+   -1 sprites/elrails.png 578 56 01 16 8 0 -15
+   -1 sprites/elrails.png 594 56 01 16 8 -7 -15
+   -1 sprites/elrails.png 610 56 09 16 13 4 2
+   -1 sprites/elrails.png 642 56 09 16 20 0 2
+   -1 sprites/elrails.png 674 56 09 16 20 0 2
+   -1 sprites/elrails.png 706 56 09 16 20 0 2
+   -1 sprites/elrails.png 738 56 03 30 38 -3 -14
+   -1 sprites/elrails.png 2 104 03 44 72 -16 -8
+   -1 sprites/elrails.png 82 104 03 35 44 -21 -2
+   -1 sprites/elrails.png 146 104 03 44 72 -16 -35
+   -1 sprites/elrails.png 226 104 09 19 20 0 1
+   -1 sprites/elrails.png 258 104 03 32 32 0 0
+   -1 sprites/elrails.png 306 104 01 22 12 -9 -18
+   -1 sprites/elrails.png 338 104 01 22 12 -1 -18
--- a/media/extra_grf/fix_graphics.nfo
+++ b/media/extra_grf/fix_graphics.nfo
@@ -12,194 +12,194 @@
   -1 * 6	 07 83 01 \7= 03 3D
 // Fix missing wheels on the wood trucks
   -1 * 14	 0A 04 01 87 0C 01 89 0C 01 07 0E 01 09 0E
-   -1 sprites/fix_graphics.png 8bpp  82    8  22  16  -6  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 114    8  22  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 146    8  22  16  -6  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 178    8  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 82 8 09 16 22 -6 -7
+   -1 sprites/fix_graphics.png 114 8 09 16 22 -14 -7
+   -1 sprites/fix_graphics.png 146 8 09 16 22 -6 -7
+   -1 sprites/fix_graphics.png 178 8 09 16 22 -14 -7
 // Show correct graphics for various 3rd generation trucks
   -1 * 5	 0A 01 28 C4 0D
-   -1 sprites/fix_graphics.png 8bpp 226    8   8  18  -3 -10 normal
-   -1 sprites/fix_graphics.png 8bpp 242    8  20  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 274    8  28  12 -14  -6 normal
-   -1 sprites/fix_graphics.png 8bpp 322    8  20  16  -6  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 354    8   8  18  -3 -10 normal
-   -1 sprites/fix_graphics.png 8bpp 370    8  20  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 402    8  28  12 -14  -6 normal
-   -1 sprites/fix_graphics.png 8bpp 450    8  20  16  -6  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 482    8   8  18  -3 -10 normal
-   -1 sprites/fix_graphics.png 8bpp 498    8  20  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 530    8  28  12 -14  -6 normal
-   -1 sprites/fix_graphics.png 8bpp 578    8  20  16  -6  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 610    8   8  18  -3 -10 normal
-   -1 sprites/fix_graphics.png 8bpp 626    8  20  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 658    8  28  12 -14  -6 normal
-   -1 sprites/fix_graphics.png 8bpp 706    8  20  16  -6  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 738    8   8  18  -3 -10 normal
-   -1 sprites/fix_graphics.png 8bpp 754    8  22  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp   2   40  28  12 -14  -6 normal
-   -1 sprites/fix_graphics.png 8bpp  50   40  22  16  -6  -7 normal
-   -1 sprites/fix_graphics.png 8bpp  82   40   8  18  -3 -10 normal
-   -1 sprites/fix_graphics.png 8bpp  98   40  22  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 130   40  28  12 -14  -6 normal
-   -1 sprites/fix_graphics.png 8bpp 178   40  22  16  -6  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 210   40   8  18  -3 -10 normal
-   -1 sprites/fix_graphics.png 8bpp 226   40  22  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 258   40  28  12 -14  -6 normal
-   -1 sprites/fix_graphics.png 8bpp 306   40  22  16  -6  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 338   40   8  18  -3 -10 normal
-   -1 sprites/fix_graphics.png 8bpp 354   40  22  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 386   40  28  12 -14  -6 normal
-   -1 sprites/fix_graphics.png 8bpp 434   40  22  16  -6  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 466   40   8  18  -3 -10 normal
-   -1 sprites/fix_graphics.png 8bpp 482   40  20  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 514   40  28  12 -14  -6 normal
-   -1 sprites/fix_graphics.png 8bpp 562   40  20  16  -6  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 594   40   8  18  -3 -10 normal
-   -1 sprites/fix_graphics.png 8bpp 610   40  20  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 642   40  28  12 -14  -6 normal
-   -1 sprites/fix_graphics.png 8bpp 690   40  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 226 8 01 18 8 -3 -10
+   -1 sprites/fix_graphics.png 242 8 09 16 20 -14 -7
+   -1 sprites/fix_graphics.png 274 8 01 12 28 -14 -6
+   -1 sprites/fix_graphics.png 322 8 09 16 20 -6 -7
+   -1 sprites/fix_graphics.png 354 8 01 18 8 -3 -10
+   -1 sprites/fix_graphics.png 370 8 09 16 20 -14 -7
+   -1 sprites/fix_graphics.png 402 8 01 12 28 -14 -6
+   -1 sprites/fix_graphics.png 450 8 09 16 20 -6 -7
+   -1 sprites/fix_graphics.png 482 8 01 18 8 -3 -10
+   -1 sprites/fix_graphics.png 498 8 09 16 20 -14 -7
+   -1 sprites/fix_graphics.png 530 8 01 12 28 -14 -6
+   -1 sprites/fix_graphics.png 578 8 09 16 20 -6 -7
+   -1 sprites/fix_graphics.png 610 8 01 18 8 -3 -10
+   -1 sprites/fix_graphics.png 626 8 09 16 20 -14 -7
+   -1 sprites/fix_graphics.png 658 8 01 12 28 -14 -6
+   -1 sprites/fix_graphics.png 706 8 09 16 20 -6 -7
+   -1 sprites/fix_graphics.png 738 8 01 18 8 -3 -10
+   -1 sprites/fix_graphics.png 754 8 09 16 22 -14 -7
+   -1 sprites/fix_graphics.png 2 40 01 12 28 -14 -6
+   -1 sprites/fix_graphics.png 50 40 09 16 22 -6 -7
+   -1 sprites/fix_graphics.png 82 40 01 18 8 -3 -10
+   -1 sprites/fix_graphics.png 98 40 09 16 22 -14 -7
+   -1 sprites/fix_graphics.png 130 40 01 12 28 -14 -6
+   -1 sprites/fix_graphics.png 178 40 09 16 22 -6 -7
+   -1 sprites/fix_graphics.png 210 40 01 18 8 -3 -10
+   -1 sprites/fix_graphics.png 226 40 09 16 22 -14 -7
+   -1 sprites/fix_graphics.png 258 40 01 12 28 -14 -6
+   -1 sprites/fix_graphics.png 306 40 09 16 22 -6 -7
+   -1 sprites/fix_graphics.png 338 40 01 18 8 -3 -10
+   -1 sprites/fix_graphics.png 354 40 09 16 22 -14 -7
+   -1 sprites/fix_graphics.png 386 40 01 12 28 -14 -6
+   -1 sprites/fix_graphics.png 434 40 09 16 22 -6 -7
+   -1 sprites/fix_graphics.png 466 40 01 18 8 -3 -10
+   -1 sprites/fix_graphics.png 482 40 09 16 20 -14 -7
+   -1 sprites/fix_graphics.png 514 40 01 12 28 -14 -6
+   -1 sprites/fix_graphics.png 562 40 09 16 20 -6 -7
+   -1 sprites/fix_graphics.png 594 40 01 18 8 -3 -10
+   -1 sprites/fix_graphics.png 610 40 09 16 20 -14 -7
+   -1 sprites/fix_graphics.png 642 40 01 12 28 -14 -6
+   -1 sprites/fix_graphics.png 690 40 09 16 20 -6 -7
 // Fix clipping on the 2nd generation paper truck
   -1 * 14	 0A 04 01 9D 0C 01 9F 0C 01 A1 0C 01 A3 0C
-   -1 sprites/fix_graphics.png 8bpp 738   40  22  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 770   40  22  16  -6  -7 normal
-   -1 sprites/fix_graphics.png 8bpp   2   72  22  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp  34   72  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 738 40 09 16 22 -14 -7
+   -1 sprites/fix_graphics.png 770 40 09 16 22 -6 -7
+   -1 sprites/fix_graphics.png 2 72 09 16 22 -14 -7
+   -1 sprites/fix_graphics.png 34 72 09 16 22 -6 -7
 // Fix clipping on the 1st generation paper truck
   -1 * 14	 0A 04 01 5D 0D 01 5F 0D 01 61 0D 01 63 0D
-   -1 sprites/fix_graphics.png 8bpp  82   72  22  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 114   72  22  17  -5  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 146   72  22  17 -14  -8 normal
-   -1 sprites/fix_graphics.png 8bpp 178   72  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 82 72 09 16 22 -14 -7
+   -1 sprites/fix_graphics.png 114 72 09 17 22 -5 -7
+   -1 sprites/fix_graphics.png 146 72 09 17 22 -14 -8
+   -1 sprites/fix_graphics.png 178 72 09 16 22 -6 -7
 // Fix clipping on the 3rd generation paper truck
   -1 * 14	 0A 04 01 1D 0E 01 1F 0E 01 21 0E 01 23 0E
-   -1 sprites/fix_graphics.png 8bpp 226   72  22  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 258   72  22  16  -6  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 290   72  22  16 -14  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 322   72  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 226 72 09 16 22 -14 -7
+   -1 sprites/fix_graphics.png 258 72 09 16 22 -6 -7
+   -1 sprites/fix_graphics.png 290 72 09 16 22 -14 -7
+   -1 sprites/fix_graphics.png 322 72 09 16 22 -6 -7

 // Fix clipping on the toyland toy van in the German DOS graphics
   -1 * 6 07 83 01 \7! 03 02
   -1 * 5 0A 01 01 5D 0C
-   -1 sprites/fix_graphics.png 8bpp  18  296  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 18 296 09 16 20 -14 -7

 // Non-toyland specific
   -1 * 6	 07 83 01 \7= 03 08
 // Fix offsets for the monorail bridge heads
   -1 * 8	 0A 02 01 EA 10 02 EC 10
-   -1 sprites/fix_graphics.png 8bpp 370   72  48  35 -23  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 434   72  48  35 -23  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 498   72  49  21 -24   3 normal
+   -1 sprites/fix_graphics.png 370 72 09 35 48 -23 -7
+   -1 sprites/fix_graphics.png 434 72 09 35 48 -23 -7
+   -1 sprites/fix_graphics.png 498 72 09 21 49 -24 3
 // Fix offsets for the maglev bridge heads
   -1 * 8	 0A 02 01 12 11 02 14 11
-   -1 sprites/fix_graphics.png 8bpp 322  486  48  35 -23  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 386  486  48  35 -23  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 450  486  49  21 -24   3 normal
+   -1 sprites/fix_graphics.png 322 486 09 35 48 -23 -7
+   -1 sprites/fix_graphics.png 386 486 09 35 48 -23 -7
+   -1 sprites/fix_graphics.png 450 486 09 21 49 -24 3

 // Toyland specific
   -1 * 6	 07 83 01 \7! 03 0F
 // Fix offsets for the toyland monorail bridge heads
   -1 * 8	 0A 02 01 EA 10 02 EC 10
-   -1 sprites/fix_graphics.png 8bpp 610  630  48  35 -23  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 674  630  48  35 -23  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 738  630  49  21 -24   3 normal
+   -1 sprites/fix_graphics.png 610 630 09 35 48 -23 -7
+   -1 sprites/fix_graphics.png 674 630 09 35 48 -23 -7
+   -1 sprites/fix_graphics.png 738 630 09 21 49 -24 3
 // Fix offsets for the toyland maglev bridge heads
   -1 * 8	 0A 02 01 12 11 02 14 11
-   -1 sprites/fix_graphics.png 8bpp  18  678  48  35 -23  -7 normal
-   -1 sprites/fix_graphics.png 8bpp  82  678  48  35 -23  -7 normal
-   -1 sprites/fix_graphics.png 8bpp 146  678  49  21 -24   3 normal
+   -1 sprites/fix_graphics.png 18 678 09 35 48 -23 -7
+   -1 sprites/fix_graphics.png 82 678 09 35 48 -23 -7
+   -1 sprites/fix_graphics.png 146 678 09 21 49 -24 3
 // Fix colours for toyland maglev junction overlays
   -1 * 5	 0A 01 06 91 04
-   -1 sprites/fix_graphics.png 8bpp 338  630  30  16 -14   8 normal
-   -1 sprites/fix_graphics.png 8bpp 386  630  30  16 -14   8 normal
-   -1 sprites/fix_graphics.png 8bpp 434  630  40   7 -19   4 normal
-   -1 sprites/fix_graphics.png 8bpp 482  630  40   7 -19  20 normal
-   -1 sprites/fix_graphics.png 8bpp 530  630  12  19  11   6 normal
-   -1 sprites/fix_graphics.png 8bpp 562  630  12  19 -21   6 normal
+   -1 sprites/fix_graphics.png 338 630 09 16 30 -14 8
+   -1 sprites/fix_graphics.png 386 630 09 16 30 -14 8
+   -1 sprites/fix_graphics.png 434 630 01 7 40 -19 4
+   -1 sprites/fix_graphics.png 482 630 01 7 40 -19 20
+   -1 sprites/fix_graphics.png 530 630 01 19 12 11 6
+   -1 sprites/fix_graphics.png 562 630 01 19 12 -21 6

 // Fix transparency of cinema
   -1 * 5	 0A 01 02 34 11
-   -1 sprites/fix_graphics.png 8bpp 578   72  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 658   72  50  47 -28 -20 normal
+   -1 sprites/fix_graphics.png 578 72 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 658 72 09 47 50 -28 -20

 // Fix misaligned undergrounds for temperate monorail
   -1 * 6	 07 83 01 \7! 00 06
   -1 * 5	 0A 01 05 4C 04
-   -1 sprites/fix_graphics.png 8bpp   2  136  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp  82  136  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 162  136  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 242  136  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 322  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 2 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 82 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 162 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 242 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 322 136 09 31 64 -31 0

 // Fix misaligned undergrounds for arctic monorail
   -1 * 6	 07 83 01 \7! 01 06
   -1 * 5	 0A 01 05 4C 04
-   -1 sprites/fix_graphics.png 8bpp 434  136  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 514  136  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 594  136  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 674  136  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp   2  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 434 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 514 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 594 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 674 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 2 184 09 31 64 -31 0

 // Fix misaligned undergrounds for tropical/desert monorail/maglev
   -1 * 6	 07 83 01 \7! 02 10
   -1 * 11	 0A 03 05 4C 04 05 66 04 05 B8 04
-   -1 sprites/fix_graphics.png 8bpp 114  184  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 194  184  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 274  184  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 354  184  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 434  184  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 514  184  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 594  184  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 674  184  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp   2  232  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp  82  232  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 162  232  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 242  232  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 322  232  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 402  232  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 482  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 114 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 194 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 274 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 354 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 434 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 514 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 594 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 674 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 2 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 82 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 162 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 242 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 322 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 402 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 482 232 09 31 64 -31 0

 // Fix misaligned X crossing for snow-covered monorail
   -1 * 6	 07 83 01 \7! 01 02
   -1 * 5	 0A 01 01 65 04
-   -1 sprites/fix_graphics.png 8bpp 594  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 594 232 09 31 64 -31 0

 // Fix offsets for the tropical house
   -1 * 5	 0A 01 01 FF 11
-   -1 sprites/fix_graphics.png 8bpp 706  232  64  47 -31 -16 normal
+   -1 sprites/fix_graphics.png 706 232 09 47 64 -31 -16

 // Graphics metadata pixel higher than actual graphics
   -1 * 6	 12 01 00 01 AC E2
-   -1 sprites/fix_graphics.png 8bpp  66  296   9  10   0   0 normal
+   -1 sprites/fix_graphics.png 66 296 01 10 9 0 0

 // Non-toyland specific
   -1 * 6	 07 83 01 \7= 03 0A
 // Fix offsets for the tubular bridge pillars
   -1 * 5	 0A 01 04 05 0A
-   -1 sprites/fix_graphics.png 8bpp  98  296   4   9   2  -1 normal
-   -1 sprites/fix_graphics.png 8bpp 114  296   4   9   2  -1 normal
-   -1 sprites/fix_graphics.png 8bpp 130  296   4   9  -4   0 normal
-   -1 sprites/fix_graphics.png 8bpp 146  296   4   9  -4   0 normal
+   -1 sprites/fix_graphics.png 98 296 09 9 4 2 -1
+   -1 sprites/fix_graphics.png 114 296 09 9 4 2 -1
+   -1 sprites/fix_graphics.png 130 296 09 9 4 -4 0
+   -1 sprites/fix_graphics.png 146 296 09 9 4 -4 0
 // Fix offsets for the cantilever bridge pillars
   -1 * 5	 0A 01 04 DD 09
-   -1 sprites/fix_graphics.png 8bpp 178  296  10  11   2  -3 normal
-   -1 sprites/fix_graphics.png 8bpp 194  296  10  12   2  -2 normal
-   -1 sprites/fix_graphics.png 8bpp 210  296  10  11 -10  -1 normal
-   -1 sprites/fix_graphics.png 8bpp 226  296  10  11 -10  -1 normal
+   -1 sprites/fix_graphics.png 178 296 09 11 10 2 -3
+   -1 sprites/fix_graphics.png 194 296 09 12 10 2 -2
+   -1 sprites/fix_graphics.png 210 296 09 11 10 -10 -1
+   -1 sprites/fix_graphics.png 226 296 09 11 10 -10 -1

 // Toyland specific
   -1 * 6	 07 83 01 \7! 03 0A
 // Fix offsets for the toyland tubular bridge pillars
   -1 * 5	 0A 01 04 05 0A
-   -1 sprites/fix_graphics.png 8bpp 248  296   4   9   2  -1 normal
-   -1 sprites/fix_graphics.png 8bpp 264  296   4   9   2  -1 normal
-   -1 sprites/fix_graphics.png 8bpp 280  296   4   9  -4   0 normal
-   -1 sprites/fix_graphics.png 8bpp 296  296   4   9  -4   0 normal
+   -1 sprites/fix_graphics.png 248 296 09 9 4 2 -1
+   -1 sprites/fix_graphics.png 264 296 09 9 4 2 -1
+   -1 sprites/fix_graphics.png 280 296 09 9 4 -4 0
+   -1 sprites/fix_graphics.png 296 296 09 9 4 -4 0
 // Fix offsets for the toyland cantilever bridge pillars
   -1 * 5	 0A 01 04 DD 09
-   -1 sprites/fix_graphics.png 8bpp 328  296  10  11   2  -3 normal
-   -1 sprites/fix_graphics.png 8bpp 344  296  10  12   2  -2 normal
-   -1 sprites/fix_graphics.png 8bpp 360  296  10  11 -10  -1 normal
-   -1 sprites/fix_graphics.png 8bpp 376  296  10  11 -10  -1 normal
+   -1 sprites/fix_graphics.png 328 296 09 11 10 2 -3
+   -1 sprites/fix_graphics.png 344 296 09 12 10 2 -2
+   -1 sprites/fix_graphics.png 360 296 09 11 10 -10 -1
+   -1 sprites/fix_graphics.png 376 296 09 11 10 -10 -1

 // Wrong, non-translated colours in tubular bridge in 'normal' climates
 // Toyland has separate sprites which are not colour translated, thus
@@ -208,169 +208,169 @@
   -1 * 6	 07 83 01 \7= 03 \b22
 // Main tubular bridge sprites
   -1 * 5	 0A 01 \b6 \w2559
-   -1 sprites/fix_graphics.png 8bpp   2  330  32  40 -30 -26 normal
-   -1 sprites/fix_graphics.png 8bpp  52  330  44  50 -42 -26 normal
-   -1 sprites/fix_graphics.png 8bpp 116  330  46  45 -42 -21 normal
-   -1 sprites/fix_graphics.png 8bpp 180  330  46  45  -2 -20 normal
-   -1 sprites/fix_graphics.png 8bpp 244  330  44  50   0 -25 normal
-   -1 sprites/fix_graphics.png 8bpp 308  330  32  41   0 -25 normal
+   -1 sprites/fix_graphics.png 2 330 09 40 32 -30 -26
+   -1 sprites/fix_graphics.png 52 330 09 50 44 -42 -26
+   -1 sprites/fix_graphics.png 116 330 09 45 46 -42 -21
+   -1 sprites/fix_graphics.png 180 330 09 45 46 -2 -20
+   -1 sprites/fix_graphics.png 244 330 09 50 44 0 -25
+   -1 sprites/fix_graphics.png 308 330 09 41 32 0 -25
 // start rail bridge
   -1 * 5	 0A 01 01 \w2569
-   -1 sprites/fix_graphics.png 8bpp 350  330  52  29 -25  -4 normal
+   -1 sprites/fix_graphics.png 350 330 09 29 52 -25 -4
 // start rail + road bridge
   -1 * 5	 0A 01 02 \w2574
-   -1 sprites/fix_graphics.png 8bpp 420  330  50  29 -25  -4 normal
-   -1 sprites/fix_graphics.png 8bpp 489  330  52  29 -25  -4 normal
+   -1 sprites/fix_graphics.png 420 330 09 29 50 -25 -4
+   -1 sprites/fix_graphics.png 489 330 09 29 52 -25 -4
 // start road + monorail bridge
   -1 * 5	 0A 01 02 \w2580
-   -1 sprites/fix_graphics.png 8bpp 559  330  50  29 -25  -4 normal
-   -1 sprites/fix_graphics.png 8bpp 629  330  52  29 -25  -4 normal
+   -1 sprites/fix_graphics.png 559 330 09 29 50 -25 -4
+   -1 sprites/fix_graphics.png 629 330 09 29 52 -25 -4
 // start monrail + maglev bridge
   -1 * 5	 0A 01 02 \w2586
-   -1 sprites/fix_graphics.png 8bpp 699  330  50  29 -25  -4 normal
-   -1 sprites/fix_graphics.png 8bpp 489  283  52  29 -25  -4 normal
+   -1 sprites/fix_graphics.png 699 330 09 29 50 -25 -4
+   -1 sprites/fix_graphics.png 489 283 09 29 52 -25 -4
 // start maglev bridge
   -1 * 5	 0A 01 01 \w2592
-   -1 sprites/fix_graphics.png 8bpp 559  283  50  29 -25  -4 normal
+   -1 sprites/fix_graphics.png 559 283 09 29 50 -25 -4
 // GUI sprite
   -1 * 5	 0A 01 01 \w2600
-   -1 sprites/fix_graphics.png 8bpp 433  298  40  15   0   5 normal
+   -1 sprites/fix_graphics.png 433 298 09 15 40 0 5

 // Remove road markings from tropical rail crossings
   -1 * 6	 07 83 01 \7! 02 19
   -1 * 14	 0A 04 04 5A 05 08 62 05 08 6E 05 04 7A 05
-   -1 sprites/fix_graphics.png 8bpp   2  390  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp  82  390  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 162  390  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 242  390  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 322  390  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 402  390  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 482  390  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 562  390  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 642  390  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 722  390  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp   2  438  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp  82  438  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 162  438  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 242  438  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 322  438  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 402  438  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 482  438  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 562  438  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 642  438  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 722  438  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp   2  486  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp  82  486  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 162  486  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 242  486  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 2 390 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 82 390 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 162 390 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 242 390 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 322 390 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 402 390 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 482 390 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 562 390 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 642 390 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 722 390 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 2 438 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 82 438 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 162 438 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 242 438 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 322 438 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 402 438 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 482 438 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 562 438 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 642 438 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 722 438 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 2 486 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 82 486 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 162 486 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 242 486 09 31 64 -31 0

 // Fix transparency of steel mill
   -1 * 5	 0A 01 06 46 08
-   -1 sprites/fix_graphics.png 8bpp 162  870  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 242  870  64  51 -31 -21 normal
-   -1 sprites/fix_graphics.png 8bpp 322  870  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 402  870  49  58 -29 -29 normal
-   -1 sprites/fix_graphics.png 8bpp 466  870  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 546  870  45  42 -18 -12 normal
+   -1 sprites/fix_graphics.png 162 870 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 242 870 09 51 64 -31 -21
+   -1 sprites/fix_graphics.png 322 870 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 402 870 09 58 49 -29 -29
+   -1 sprites/fix_graphics.png 466 870 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 546 870 09 42 45 -18 -12
   -1 * 5	 0A 01 0A 4D 08
-   -1 sprites/fix_graphics.png 8bpp 610  486  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 690  486  59  61 -31 -33 normal
-   -1 sprites/fix_graphics.png 8bpp   2  566  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp  82  566  51  50 -25 -21 normal
-   -1 sprites/fix_graphics.png 8bpp 606  870  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 686  870  64  46 -31 -16 normal
-   -1 sprites/fix_graphics.png 8bpp   2  945  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp  82  945  50  51 -29 -21 normal
-   -1 sprites/fix_graphics.png 8bpp 146  945  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 226  945  47  42 -18 -12 normal
+   -1 sprites/fix_graphics.png 610 486 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 690 486 09 61 59 -31 -33
+   -1 sprites/fix_graphics.png 2 566 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 82 566 09 50 51 -25 -21
+   -1 sprites/fix_graphics.png 606 870 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 686 870 09 46 64 -31 -16
+   -1 sprites/fix_graphics.png 2 945 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 82 945 09 51 50 -29 -21
+   -1 sprites/fix_graphics.png 146 945 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 226 945 09 42 47 -18 -12
   -1 * 5	 0A 01 04 58 08
-   -1 sprites/fix_graphics.png 8bpp 162  566  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 242  566  59  52 -31 -24 normal
-   -1 sprites/fix_graphics.png 8bpp 306  566  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 386  566  51  44 -25 -15 normal
+   -1 sprites/fix_graphics.png 162 566 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 242 566 09 52 59 -31 -24
+   -1 sprites/fix_graphics.png 306 566 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 386 566 09 44 51 -25 -15

 // Fix transparency of oil well
   -1 * 5	 0A 01 07 7D 08
-   -1 sprites/fix_graphics.png 8bpp   2  630  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 482  566  31  50 -11 -28 normal
-   -1 sprites/fix_graphics.png 8bpp 530  566  31  47 -11 -25 normal
-   -1 sprites/fix_graphics.png 8bpp 578  566  31  47 -11 -25 normal
-   -1 sprites/fix_graphics.png 8bpp 626  566  31  47 -11 -25 normal
-   -1 sprites/fix_graphics.png 8bpp 674  566  31  49 -11 -27 normal
-   -1 sprites/fix_graphics.png 8bpp 722  566  31  52 -11 -30 normal
+   -1 sprites/fix_graphics.png 2 630 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 482 566 09 50 31 -11 -28
+   -1 sprites/fix_graphics.png 530 566 09 47 31 -11 -25
+   -1 sprites/fix_graphics.png 578 566 09 47 31 -11 -25
+   -1 sprites/fix_graphics.png 626 566 09 47 31 -11 -25
+   -1 sprites/fix_graphics.png 674 566 09 49 31 -11 -27
+   -1 sprites/fix_graphics.png 722 566 09 52 31 -11 -30
   -1 * 6	 07 83 01 \7! 01 02
   -1 * 5	 0A 01 01 7D 08
-   -1 sprites/fix_graphics.png 8bpp 114  630  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 114 630 09 31 64 -31 0
   -1 * 6	 07 83 01 \7! 02 02
   -1 * 5	 0A 01 01 7D 08
-   -1 sprites/fix_graphics.png 8bpp 226  630  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 226 630 09 31 64 -31 0

 // Fix city airport's grass for temperate
   -1 * 6	 07 83 01 \7! 00 0A
   -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 8bpp 242  678  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 322  678  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 402  678  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 482  678  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 562  678  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 642  678  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 722  678  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp   2  726  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp  82  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 242 678 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 322 678 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 402 678 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 482 678 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 562 678 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 642 678 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 722 678 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 2 726 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 82 726 09 31 64 -31 0

 // Fix city airport's grass for arctic
   -1 * 6	 07 83 01 \7! 01 0A
   -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 8bpp 194  726  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 274  726  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 354  726  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 434  726  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 514  726  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 594  726  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 674  726  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp   2  774  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp  82  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 194 726 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 274 726 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 354 726 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 434 726 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 514 726 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 594 726 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 674 726 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 2 774 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 82 774 09 31 64 -31 0

 // Fix city airport's grass for tropical
   -1 * 6	 07 83 01 \7! 02 0A
   -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 8bpp 194  774  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 274  774  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 354  774  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 434  774  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 514  774  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 594  774  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 674  774  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp   2  822  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp  82  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 194 774 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 274 774 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 354 774 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 434 774 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 514 774 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 594 774 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 674 774 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 2 822 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 82 822 09 31 64 -31 0

 // Fix city airport's grass for toyland
   -1 * 6	 07 83 01 \7! 03 0A
   -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 8bpp 194  822  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 274  822  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 354  822  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 434  822  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 514  822  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 594  822  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp 674  822  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp   2  870  64  31 -31   0 normal
-   -1 sprites/fix_graphics.png 8bpp  82  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 194 822 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 274 822 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 354 822 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 434 822 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 514 822 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 594 822 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 674 822 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 2 870 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 82 870 09 31 64 -31 0

 // Wrong, non-translated colours in arctic buildings
   -1 * 8	 0A 02 01 1F 06 01 DB 11
-   -1 sprites/fix_graphics.png 8bpp 305  945  59  29 -29 -12 normal
-   -1 sprites/fix_graphics.png 8bpp 369  945  59  29 -29 -12 normal
+   -1 sprites/fix_graphics.png 305 945 09 29 59 -29 -12
+   -1 sprites/fix_graphics.png 369 945 09 29 59 -29 -12
   -1 * 8	 0A 02 01 76 11 01 E6 11
-   -1 sprites/fix_graphics.png 8bpp 449  945  64  69 -31 -38 normal
-   -1 sprites/fix_graphics.png 8bpp 529  945  64  69 -31 -38 normal
+   -1 sprites/fix_graphics.png 449 945 09 69 64 -31 -38
+   -1 sprites/fix_graphics.png 529 945 09 69 64 -31 -38
   -1 * 8	 0A 02 02 7E 11 01 E1 11
-   -1 sprites/fix_graphics.png 8bpp 625  945  54  75 -25 -47 normal
-   -1 sprites/fix_graphics.png 8bpp   2 1037  54  75 -25 -47 normal
-   -1 sprites/fix_graphics.png 8bpp  66 1037  54  75 -25 -47 normal
+   -1 sprites/fix_graphics.png 625 945 03 75 54 -25 -47
+   -1 sprites/fix_graphics.png 2 1037 09 75 54 -25 -47
+   -1 sprites/fix_graphics.png 66 1037 09 75 54 -25 -47

 // Fix buoy in-game; don't show black outline
   -1 * 4        01 05 01 \b1
-   -1 sprites/fix_graphics.png 8bpp 575  490   7  11   7   4 normal
+   -1 sprites/fix_graphics.png 575 490 09 11 7 7 4
   -1 * 7        02 05 17 01 00 00 00
   -1 * 7        03 05 01 08 00 17 00
--- a/media/extra_grf/flags.nfo
+++ b/media/extra_grf/flags.nfo
@@ -8,39 +8,39 @@
 //
   -1 * 0	 0C "Flag graphics"
   -1 * 3	 05 14 24
-   -1 sprites/flags.png 8bpp  34    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp  50    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp  66    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp  82    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp  98    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 114    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 130    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 146    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 162    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 178    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 194    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 210    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 226    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 242    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 258    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 274    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 290    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 306    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 322    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 338    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 354    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 370    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 386    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 402    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 418    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 434    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 450    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 466    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 482    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 498    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 514    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 530    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 546    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 562    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 578    8  11   8   0   0 normal
-   -1 sprites/flags.png 8bpp 594    8  11   8   0   0 normal
+   -1 sprites/flags.png 34 8 09 8 11 0 0
+   -1 sprites/flags.png 50 8 09 8 11 0 0
+   -1 sprites/flags.png 66 8 09 8 11 0 0
+   -1 sprites/flags.png 82 8 09 8 11 0 0
+   -1 sprites/flags.png 98 8 09 8 11 0 0
+   -1 sprites/flags.png 114 8 09 8 11 0 0
+   -1 sprites/flags.png 130 8 09 8 11 0 0
+   -1 sprites/flags.png 146 8 09 8 11 0 0
+   -1 sprites/flags.png 162 8 09 8 11 0 0
+   -1 sprites/flags.png 178 8 09 8 11 0 0
+   -1 sprites/flags.png 194 8 09 8 11 0 0
+   -1 sprites/flags.png 210 8 09 8 11 0 0
+   -1 sprites/flags.png 226 8 09 8 11 0 0
+   -1 sprites/flags.png 242 8 09 8 11 0 0
+   -1 sprites/flags.png 258 8 09 8 11 0 0
+   -1 sprites/flags.png 274 8 09 8 11 0 0
+   -1 sprites/flags.png 290 8 09 8 11 0 0
+   -1 sprites/flags.png 306 8 09 8 11 0 0
+   -1 sprites/flags.png 322 8 09 8 11 0 0
+   -1 sprites/flags.png 338 8 09 8 11 0 0
+   -1 sprites/flags.png 354 8 09 8 11 0 0
+   -1 sprites/flags.png 370 8 09 8 11 0 0
+   -1 sprites/flags.png 386 8 09 8 11 0 0
+   -1 sprites/flags.png 402 8 09 8 11 0 0
+   -1 sprites/flags.png 418 8 09 8 11 0 0
+   -1 sprites/flags.png 434 8 09 8 11 0 0
+   -1 sprites/flags.png 450 8 09 8 11 0 0
+   -1 sprites/flags.png 466 8 09 8 11 0 0
+   -1 sprites/flags.png 482 8 09 8 11 0 0
+   -1 sprites/flags.png 498 8 09 8 11 0 0
+   -1 sprites/flags.png 514 8 09 8 11 0 0
+   -1 sprites/flags.png 530 8 09 8 11 0 0
+   -1 sprites/flags.png 546 8 09 8 11 0 0
+   -1 sprites/flags.png 562 8 09 8 11 0 0
+   -1 sprites/flags.png 578 8 09 8 11 0 0
+   -1 sprites/flags.png 594 8 09 8 11 0 0
--- a/media/extra_grf/foundations.nfo
+++ b/media/extra_grf/foundations.nfo
@@ -9,369 +9,369 @@
   -1 * 0	 0C "Foundations. Non-halftile ones by Marcin Grzegorczyk"
   -1 * 6	 07 83 01 \7! 00 5B
   -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 8bpp  82    8  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162    8  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242    8  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322    8  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402    8  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482    8  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562    8  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642    8  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722    8  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2   72  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82   72  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162   72  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242   72  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322   72  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402   72  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482   72  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562   72  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642   72  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722   72  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2  136  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82  136  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162  136  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242  136  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322  136  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402  136  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482  136  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562  136  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642  136  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722  136  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2  200  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82  200  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162  200  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242  200  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322  200  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402  200  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482  200  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562  200  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642  200  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722  200  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2  264  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82  264  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162  264  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242  264  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322  264  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402  264  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482  264  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562  264  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642  264  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722  264  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2  328  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82  328  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162  328  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242  328  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322  328  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402  328  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482  328  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562  328  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642  328  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722  328  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2  392  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82  392  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162  392  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242  392  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322  392  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402  392  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482  392  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562  392  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642  392  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722  392  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2  456  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82  456  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162  456  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242  456  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322  456  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402  456  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp 482  456  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp 562  456  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp 642  456  64  33 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722  456  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp   2  520  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp  82  520  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp 162  520  64  33 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242  520  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp 322  520  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp 402  520  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp 482  520  64  33 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562  520  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp 642  520  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp 722  520  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp   2  584  64  33 -31  -9 normal
+   -1 sprites/foundations.png 82 8 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 8 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 8 09 32 64 -31 -9
+   -1 sprites/foundations.png 322 8 09 32 64 -31 -9
+   -1 sprites/foundations.png 402 8 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 8 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 8 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 8 09 40 64 -31 -9
+   -1 sprites/foundations.png 722 8 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 72 09 32 64 -31 -9
+   -1 sprites/foundations.png 82 72 09 32 64 -31 -9
+   -1 sprites/foundations.png 162 72 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 72 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 72 09 32 64 -31 -9
+   -1 sprites/foundations.png 402 72 09 32 64 -31 -9
+   -1 sprites/foundations.png 482 72 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 72 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 72 09 32 64 -31 -9
+   -1 sprites/foundations.png 722 72 09 32 64 -31 -9
+   -1 sprites/foundations.png 2 136 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 136 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 136 09 32 64 -31 -9
+   -1 sprites/foundations.png 242 136 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 136 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 136 09 32 64 -31 -9
+   -1 sprites/foundations.png 482 136 09 32 64 -31 -9
+   -1 sprites/foundations.png 562 136 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 136 09 40 64 -31 -9
+   -1 sprites/foundations.png 722 136 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 200 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 200 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 200 09 32 64 -31 -9
+   -1 sprites/foundations.png 242 200 09 32 64 -31 -9
+   -1 sprites/foundations.png 322 200 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 200 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 200 09 32 64 -31 -9
+   -1 sprites/foundations.png 562 200 09 32 64 -31 -9
+   -1 sprites/foundations.png 642 200 09 40 64 -31 -9
+   -1 sprites/foundations.png 722 200 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 264 09 32 64 -31 -9
+   -1 sprites/foundations.png 82 264 09 32 64 -31 -9
+   -1 sprites/foundations.png 162 264 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 264 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 264 09 32 64 -31 -9
+   -1 sprites/foundations.png 402 264 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 264 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 264 09 32 64 -31 -9
+   -1 sprites/foundations.png 642 264 09 32 64 -31 -9
+   -1 sprites/foundations.png 722 264 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 328 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 328 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 328 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 328 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 328 09 32 64 -31 -9
+   -1 sprites/foundations.png 402 328 09 32 64 -31 -9
+   -1 sprites/foundations.png 482 328 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 328 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 328 09 32 64 -31 -9
+   -1 sprites/foundations.png 722 328 09 32 64 -31 -9
+   -1 sprites/foundations.png 2 392 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 392 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 392 09 32 64 -31 -9
+   -1 sprites/foundations.png 242 392 09 32 64 -31 -9
+   -1 sprites/foundations.png 322 392 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 392 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 392 09 32 64 -31 -9
+   -1 sprites/foundations.png 562 392 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 392 09 40 64 -31 -9
+   -1 sprites/foundations.png 722 392 09 32 64 -31 -9
+   -1 sprites/foundations.png 2 456 09 32 64 -31 -9
+   -1 sprites/foundations.png 82 456 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 456 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 456 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 456 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 456 09 40 64 -15 -17
+   -1 sprites/foundations.png 482 456 09 33 64 -31 -25
+   -1 sprites/foundations.png 562 456 09 40 64 -47 -17
+   -1 sprites/foundations.png 642 456 09 33 64 -31 -9
+   -1 sprites/foundations.png 722 456 09 40 64 -15 -17
+   -1 sprites/foundations.png 2 520 09 33 64 -31 -25
+   -1 sprites/foundations.png 82 520 09 40 64 -47 -17
+   -1 sprites/foundations.png 162 520 09 33 64 -31 -9
+   -1 sprites/foundations.png 242 520 09 40 64 -15 -17
+   -1 sprites/foundations.png 322 520 09 33 64 -31 -25
+   -1 sprites/foundations.png 402 520 09 40 64 -47 -17
+   -1 sprites/foundations.png 482 520 09 33 64 -31 -9
+   -1 sprites/foundations.png 562 520 09 40 64 -15 -17
+   -1 sprites/foundations.png 642 520 09 33 64 -31 -25
+   -1 sprites/foundations.png 722 520 09 40 64 -47 -17
+   -1 sprites/foundations.png 2 584 09 33 64 -31 -9
   -1 * 6	 07 83 01 \7! 01 5B
   -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 8bpp 114  584  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 194  584  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 274  584  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 354  584  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 434  584  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 514  584  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 594  584  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 674  584  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2  648  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82  648  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162  648  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242  648  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322  648  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402  648  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482  648  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562  648  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642  648  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722  648  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2  712  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82  712  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162  712  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242  712  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322  712  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402  712  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482  712  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562  712  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642  712  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722  712  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2  776  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82  776  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162  776  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242  776  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322  776  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402  776  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482  776  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562  776  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642  776  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722  776  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2  840  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82  840  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162  840  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242  840  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322  840  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402  840  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482  840  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562  840  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642  840  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722  840  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2  904  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82  904  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162  904  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242  904  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322  904  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402  904  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482  904  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562  904  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642  904  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722  904  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2  968  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82  968  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162  968  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242  968  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322  968  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402  968  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482  968  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562  968  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642  968  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722  968  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 1032  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 1032  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 1032  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 1032  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 1032  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 1032  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 1032  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp 562 1032  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp 642 1032  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp 722 1032  64  33 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 1096  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp  82 1096  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp 162 1096  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp 242 1096  64  33 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 1096  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp 402 1096  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp 482 1096  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp 562 1096  64  33 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642 1096  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp 722 1096  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp   2 1160  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp  82 1160  64  33 -31  -9 normal
+   -1 sprites/foundations.png 114 584 09 40 64 -31 -9
+   -1 sprites/foundations.png 194 584 09 40 64 -31 -9
+   -1 sprites/foundations.png 274 584 09 32 64 -31 -9
+   -1 sprites/foundations.png 354 584 09 32 64 -31 -9
+   -1 sprites/foundations.png 434 584 09 40 64 -31 -9
+   -1 sprites/foundations.png 514 584 09 40 64 -31 -9
+   -1 sprites/foundations.png 594 584 09 40 64 -31 -9
+   -1 sprites/foundations.png 674 584 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 648 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 648 09 32 64 -31 -9
+   -1 sprites/foundations.png 162 648 09 32 64 -31 -9
+   -1 sprites/foundations.png 242 648 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 648 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 648 09 32 64 -31 -9
+   -1 sprites/foundations.png 482 648 09 32 64 -31 -9
+   -1 sprites/foundations.png 562 648 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 648 09 40 64 -31 -9
+   -1 sprites/foundations.png 722 648 09 32 64 -31 -9
+   -1 sprites/foundations.png 2 712 09 32 64 -31 -9
+   -1 sprites/foundations.png 82 712 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 712 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 712 09 32 64 -31 -9
+   -1 sprites/foundations.png 322 712 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 712 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 712 09 32 64 -31 -9
+   -1 sprites/foundations.png 562 712 09 32 64 -31 -9
+   -1 sprites/foundations.png 642 712 09 40 64 -31 -9
+   -1 sprites/foundations.png 722 712 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 776 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 776 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 776 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 776 09 32 64 -31 -9
+   -1 sprites/foundations.png 322 776 09 32 64 -31 -9
+   -1 sprites/foundations.png 402 776 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 776 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 776 09 32 64 -31 -9
+   -1 sprites/foundations.png 642 776 09 32 64 -31 -9
+   -1 sprites/foundations.png 722 776 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 840 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 840 09 32 64 -31 -9
+   -1 sprites/foundations.png 162 840 09 32 64 -31 -9
+   -1 sprites/foundations.png 242 840 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 840 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 840 09 32 64 -31 -9
+   -1 sprites/foundations.png 482 840 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 840 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 840 09 32 64 -31 -9
+   -1 sprites/foundations.png 722 840 09 32 64 -31 -9
+   -1 sprites/foundations.png 2 904 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 904 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 904 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 904 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 904 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 904 09 32 64 -31 -9
+   -1 sprites/foundations.png 482 904 09 32 64 -31 -9
+   -1 sprites/foundations.png 562 904 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 904 09 40 64 -31 -9
+   -1 sprites/foundations.png 722 904 09 32 64 -31 -9
+   -1 sprites/foundations.png 2 968 09 32 64 -31 -9
+   -1 sprites/foundations.png 82 968 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 968 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 968 09 32 64 -31 -9
+   -1 sprites/foundations.png 322 968 09 32 64 -31 -9
+   -1 sprites/foundations.png 402 968 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 968 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 968 09 32 64 -31 -9
+   -1 sprites/foundations.png 642 968 09 40 64 -31 -9
+   -1 sprites/foundations.png 722 968 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 1032 09 32 64 -31 -9
+   -1 sprites/foundations.png 82 1032 09 32 64 -31 -9
+   -1 sprites/foundations.png 162 1032 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 1032 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 1032 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 1032 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 1032 09 40 64 -15 -17
+   -1 sprites/foundations.png 562 1032 09 33 64 -31 -25
+   -1 sprites/foundations.png 642 1032 09 40 64 -47 -17
+   -1 sprites/foundations.png 722 1032 09 33 64 -31 -9
+   -1 sprites/foundations.png 2 1096 09 40 64 -15 -17
+   -1 sprites/foundations.png 82 1096 09 33 64 -31 -25
+   -1 sprites/foundations.png 162 1096 09 40 64 -47 -17
+   -1 sprites/foundations.png 242 1096 09 33 64 -31 -9
+   -1 sprites/foundations.png 322 1096 09 40 64 -15 -17
+   -1 sprites/foundations.png 402 1096 09 33 64 -31 -25
+   -1 sprites/foundations.png 482 1096 09 40 64 -47 -17
+   -1 sprites/foundations.png 562 1096 09 33 64 -31 -9
+   -1 sprites/foundations.png 642 1096 09 40 64 -15 -17
+   -1 sprites/foundations.png 722 1096 09 33 64 -31 -25
+   -1 sprites/foundations.png 2 1160 09 40 64 -47 -17
+   -1 sprites/foundations.png 82 1160 09 33 64 -31 -9
   -1 * 6	 07 83 01 \7! 02 5B
   -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 8bpp 194 1160  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 274 1160  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 354 1160  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 434 1160  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 514 1160  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 594 1160  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 674 1160  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 1224  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 1224  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 1224  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 1224  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 1224  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 1224  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 1224  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562 1224  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642 1224  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722 1224  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 1288  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 1288  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 1288  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 1288  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 1288  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 1288  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 1288  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562 1288  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642 1288  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722 1288  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 1352  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 1352  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 1352  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 1352  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 1352  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 1352  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 1352  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562 1352  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642 1352  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722 1352  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 1416  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 1416  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 1416  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 1416  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 1416  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 1416  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 1416  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562 1416  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642 1416  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722 1416  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 1480  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 1480  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 1480  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 1480  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 1480  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 1480  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 1480  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562 1480  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642 1480  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722 1480  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 1544  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 1544  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 1544  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 1544  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 1544  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 1544  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 1544  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562 1544  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642 1544  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722 1544  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 1608  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 1608  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 1608  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 1608  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 1608  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 1608  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 1608  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562 1608  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp 642 1608  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp 722 1608  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp   2 1672  64  33 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 1672  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp 162 1672  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp 242 1672  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp 322 1672  64  33 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 1672  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp 482 1672  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp 562 1672  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp 642 1672  64  33 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722 1672  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp   2 1736  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp  82 1736  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp 162 1736  64  33 -31  -9 normal
+   -1 sprites/foundations.png 194 1160 09 40 64 -31 -9
+   -1 sprites/foundations.png 274 1160 09 40 64 -31 -9
+   -1 sprites/foundations.png 354 1160 09 32 64 -31 -9
+   -1 sprites/foundations.png 434 1160 09 32 64 -31 -9
+   -1 sprites/foundations.png 514 1160 09 40 64 -31 -9
+   -1 sprites/foundations.png 594 1160 09 40 64 -31 -9
+   -1 sprites/foundations.png 674 1160 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 1224 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 1224 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 1224 09 32 64 -31 -9
+   -1 sprites/foundations.png 242 1224 09 32 64 -31 -9
+   -1 sprites/foundations.png 322 1224 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 1224 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 1224 09 32 64 -31 -9
+   -1 sprites/foundations.png 562 1224 09 32 64 -31 -9
+   -1 sprites/foundations.png 642 1224 09 40 64 -31 -9
+   -1 sprites/foundations.png 722 1224 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 1288 09 32 64 -31 -9
+   -1 sprites/foundations.png 82 1288 09 32 64 -31 -9
+   -1 sprites/foundations.png 162 1288 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 1288 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 1288 09 32 64 -31 -9
+   -1 sprites/foundations.png 402 1288 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 1288 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 1288 09 32 64 -31 -9
+   -1 sprites/foundations.png 642 1288 09 32 64 -31 -9
+   -1 sprites/foundations.png 722 1288 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 1352 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 1352 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 1352 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 1352 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 1352 09 32 64 -31 -9
+   -1 sprites/foundations.png 402 1352 09 32 64 -31 -9
+   -1 sprites/foundations.png 482 1352 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 1352 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 1352 09 32 64 -31 -9
+   -1 sprites/foundations.png 722 1352 09 32 64 -31 -9
+   -1 sprites/foundations.png 2 1416 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 1416 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 1416 09 32 64 -31 -9
+   -1 sprites/foundations.png 242 1416 09 32 64 -31 -9
+   -1 sprites/foundations.png 322 1416 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 1416 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 1416 09 32 64 -31 -9
+   -1 sprites/foundations.png 562 1416 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 1416 09 40 64 -31 -9
+   -1 sprites/foundations.png 722 1416 09 32 64 -31 -9
+   -1 sprites/foundations.png 2 1480 09 32 64 -31 -9
+   -1 sprites/foundations.png 82 1480 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 1480 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 1480 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 1480 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 1480 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 1480 09 32 64 -31 -9
+   -1 sprites/foundations.png 562 1480 09 32 64 -31 -9
+   -1 sprites/foundations.png 642 1480 09 40 64 -31 -9
+   -1 sprites/foundations.png 722 1480 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 1544 09 32 64 -31 -9
+   -1 sprites/foundations.png 82 1544 09 32 64 -31 -9
+   -1 sprites/foundations.png 162 1544 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 1544 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 1544 09 32 64 -31 -9
+   -1 sprites/foundations.png 402 1544 09 32 64 -31 -9
+   -1 sprites/foundations.png 482 1544 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 1544 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 1544 09 32 64 -31 -9
+   -1 sprites/foundations.png 722 1544 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 1608 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 1608 09 32 64 -31 -9
+   -1 sprites/foundations.png 162 1608 09 32 64 -31 -9
+   -1 sprites/foundations.png 242 1608 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 1608 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 1608 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 1608 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 1608 09 40 64 -15 -17
+   -1 sprites/foundations.png 642 1608 09 33 64 -31 -25
+   -1 sprites/foundations.png 722 1608 09 40 64 -47 -17
+   -1 sprites/foundations.png 2 1672 09 33 64 -31 -9
+   -1 sprites/foundations.png 82 1672 09 40 64 -15 -17
+   -1 sprites/foundations.png 162 1672 09 33 64 -31 -25
+   -1 sprites/foundations.png 242 1672 09 40 64 -47 -17
+   -1 sprites/foundations.png 322 1672 09 33 64 -31 -9
+   -1 sprites/foundations.png 402 1672 09 40 64 -15 -17
+   -1 sprites/foundations.png 482 1672 09 33 64 -31 -25
+   -1 sprites/foundations.png 562 1672 09 40 64 -47 -17
+   -1 sprites/foundations.png 642 1672 09 33 64 -31 -9
+   -1 sprites/foundations.png 722 1672 09 40 64 -15 -17
+   -1 sprites/foundations.png 2 1736 09 33 64 -31 -25
+   -1 sprites/foundations.png 82 1736 09 40 64 -47 -17
+   -1 sprites/foundations.png 162 1736 09 33 64 -31 -9
   -1 * 6	 07 83 01 \7! 03 5B
   -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 8bpp 274 1736  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 354 1736  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 434 1736  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 514 1736  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 594 1736  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 674 1736  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 1800  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 1800  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 1800  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 1800  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 1800  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 1800  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 1800  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562 1800  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642 1800  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722 1800  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 1864  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 1864  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 1864  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 1864  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 1864  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 1864  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 1864  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562 1864  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642 1864  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722 1864  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 1928  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 1928  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 1928  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 1928  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 1928  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 1928  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 1928  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562 1928  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642 1928  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722 1928  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 1992  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 1992  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 1992  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 1992  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 1992  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 1992  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 1992  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562 1992  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642 1992  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722 1992  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 2056  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 2056  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 2056  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 2056  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 2056  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 2056  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 2056  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562 2056  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642 2056  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722 2056  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 2120  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 2120  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 2120  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 2120  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 2120  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 2120  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 2120  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562 2120  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642 2120  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 722 2120  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 2184  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp  82 2184  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 2184  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 242 2184  64  32 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 322 2184  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 402 2184  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 2184  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 562 2184  64  40 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 642 2184  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp 722 2184  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp   2 2248  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp  82 2248  64  33 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 162 2248  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp 242 2248  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp 322 2248  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp 402 2248  64  33 -31  -9 normal
-   -1 sprites/foundations.png 8bpp 482 2248  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp 562 2248  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp 642 2248  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp 722 2248  64  33 -31  -9 normal
-   -1 sprites/foundations.png 8bpp   2 2312  64  40 -15 -17 normal
-   -1 sprites/foundations.png 8bpp  82 2312  64  33 -31 -25 normal
-   -1 sprites/foundations.png 8bpp 162 2312  64  40 -47 -17 normal
-   -1 sprites/foundations.png 8bpp 242 2312  64  33 -31  -9 normal
+   -1 sprites/foundations.png 274 1736 09 40 64 -31 -9
+   -1 sprites/foundations.png 354 1736 09 40 64 -31 -9
+   -1 sprites/foundations.png 434 1736 09 32 64 -31 -9
+   -1 sprites/foundations.png 514 1736 09 32 64 -31 -9
+   -1 sprites/foundations.png 594 1736 09 40 64 -31 -9
+   -1 sprites/foundations.png 674 1736 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 1800 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 1800 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 1800 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 1800 09 32 64 -31 -9
+   -1 sprites/foundations.png 322 1800 09 32 64 -31 -9
+   -1 sprites/foundations.png 402 1800 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 1800 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 1800 09 32 64 -31 -9
+   -1 sprites/foundations.png 642 1800 09 32 64 -31 -9
+   -1 sprites/foundations.png 722 1800 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 1864 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 1864 09 32 64 -31 -9
+   -1 sprites/foundations.png 162 1864 09 32 64 -31 -9
+   -1 sprites/foundations.png 242 1864 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 1864 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 1864 09 32 64 -31 -9
+   -1 sprites/foundations.png 482 1864 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 1864 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 1864 09 32 64 -31 -9
+   -1 sprites/foundations.png 722 1864 09 32 64 -31 -9
+   -1 sprites/foundations.png 2 1928 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 1928 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 1928 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 1928 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 1928 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 1928 09 32 64 -31 -9
+   -1 sprites/foundations.png 482 1928 09 32 64 -31 -9
+   -1 sprites/foundations.png 562 1928 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 1928 09 40 64 -31 -9
+   -1 sprites/foundations.png 722 1928 09 32 64 -31 -9
+   -1 sprites/foundations.png 2 1992 09 32 64 -31 -9
+   -1 sprites/foundations.png 82 1992 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 1992 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 1992 09 32 64 -31 -9
+   -1 sprites/foundations.png 322 1992 09 32 64 -31 -9
+   -1 sprites/foundations.png 402 1992 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 1992 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 1992 09 32 64 -31 -9
+   -1 sprites/foundations.png 642 1992 09 40 64 -31 -9
+   -1 sprites/foundations.png 722 1992 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 2056 09 32 64 -31 -9
+   -1 sprites/foundations.png 82 2056 09 32 64 -31 -9
+   -1 sprites/foundations.png 162 2056 09 40 64 -31 -9
+   -1 sprites/foundations.png 242 2056 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 2056 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 2056 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 2056 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 2056 09 32 64 -31 -9
+   -1 sprites/foundations.png 642 2056 09 32 64 -31 -9
+   -1 sprites/foundations.png 722 2056 09 40 64 -31 -9
+   -1 sprites/foundations.png 2 2120 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 2120 09 32 64 -31 -9
+   -1 sprites/foundations.png 162 2120 09 32 64 -31 -9
+   -1 sprites/foundations.png 242 2120 09 40 64 -31 -9
+   -1 sprites/foundations.png 322 2120 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 2120 09 32 64 -31 -9
+   -1 sprites/foundations.png 482 2120 09 32 64 -31 -9
+   -1 sprites/foundations.png 562 2120 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 2120 09 40 64 -31 -9
+   -1 sprites/foundations.png 722 2120 09 32 64 -31 -9
+   -1 sprites/foundations.png 2 2184 09 40 64 -31 -9
+   -1 sprites/foundations.png 82 2184 09 40 64 -31 -9
+   -1 sprites/foundations.png 162 2184 09 32 64 -31 -9
+   -1 sprites/foundations.png 242 2184 09 32 64 -31 -9
+   -1 sprites/foundations.png 322 2184 09 40 64 -31 -9
+   -1 sprites/foundations.png 402 2184 09 40 64 -31 -9
+   -1 sprites/foundations.png 482 2184 09 40 64 -31 -9
+   -1 sprites/foundations.png 562 2184 09 40 64 -31 -9
+   -1 sprites/foundations.png 642 2184 09 40 64 -15 -17
+   -1 sprites/foundations.png 722 2184 09 33 64 -31 -25
+   -1 sprites/foundations.png 2 2248 09 40 64 -47 -17
+   -1 sprites/foundations.png 82 2248 09 33 64 -31 -9
+   -1 sprites/foundations.png 162 2248 09 40 64 -15 -17
+   -1 sprites/foundations.png 242 2248 09 33 64 -31 -25
+   -1 sprites/foundations.png 322 2248 09 40 64 -47 -17
+   -1 sprites/foundations.png 402 2248 09 33 64 -31 -9
+   -1 sprites/foundations.png 482 2248 09 40 64 -15 -17
+   -1 sprites/foundations.png 562 2248 09 33 64 -31 -25
+   -1 sprites/foundations.png 642 2248 09 40 64 -47 -17
+   -1 sprites/foundations.png 722 2248 09 33 64 -31 -9
+   -1 sprites/foundations.png 2 2312 09 40 64 -15 -17
+   -1 sprites/foundations.png 82 2312 09 33 64 -31 -25
+   -1 sprites/foundations.png 162 2312 09 40 64 -47 -17
+   -1 sprites/foundations.png 242 2312 09 33 64 -31 -9
--- a/media/extra_grf/mono.nfo
+++ b/media/extra_grf/mono.nfo
@@ -8,233 +8,233 @@
 //
   -1 * 0	 0C "Monospaced characters (Liberation Mono)"
   -1 * 0 12 01 03 60 20 00
-   -1 sprites/mono.png 8bpp  10   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  25   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  40   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  55   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  70   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  85   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 100   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 115   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 130   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 145   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 160   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 175   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 190   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 205   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 220   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 235   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 250   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 265   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 280   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 295   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 310   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 325   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 340   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 355   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 370   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 385   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 400   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 415   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 430   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 445   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 460   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 475   30   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  10   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  25   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  40   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  55   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  70   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  85   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 100   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 115   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 130   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 145   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 160   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 175   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 190   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 205   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 220   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 235   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 250   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 265   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 280   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 295   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 310   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 325   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 340   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 355   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 370   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 385   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 400   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 415   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 430   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 445   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 460   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 475   50   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  10   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  25   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  40   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  55   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  70   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  85   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 100   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 115   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 130   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 145   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 160   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 175   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 190   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 205   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 220   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 235   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 250   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 265   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 280   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 295   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 310   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 325   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 340   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 355   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 370   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 385   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 400   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 415   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 430   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 445   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 460   70   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 475   70   7  13   0   0 normal
+   -1 sprites/mono.png  10  30 01 13 7 0 0
+   -1 sprites/mono.png  25  30 01 13 7 0 0
+   -1 sprites/mono.png  40  30 01 13 7 0 0
+   -1 sprites/mono.png  55  30 01 13 7 0 0
+   -1 sprites/mono.png  70  30 01 13 7 0 0
+   -1 sprites/mono.png  85  30 01 13 7 0 0
+   -1 sprites/mono.png 100  30 01 13 7 0 0
+   -1 sprites/mono.png 115  30 01 13 7 0 0
+   -1 sprites/mono.png 130  30 01 13 7 0 0
+   -1 sprites/mono.png 145  30 01 13 7 0 0
+   -1 sprites/mono.png 160  30 01 13 7 0 0
+   -1 sprites/mono.png 175  30 01 13 7 0 0
+   -1 sprites/mono.png 190  30 01 13 7 0 0
+   -1 sprites/mono.png 205  30 01 13 7 0 0
+   -1 sprites/mono.png 220  30 01 13 7 0 0
+   -1 sprites/mono.png 235  30 01 13 7 0 0
+   -1 sprites/mono.png 250  30 01 13 7 0 0
+   -1 sprites/mono.png 265  30 01 13 7 0 0
+   -1 sprites/mono.png 280  30 01 13 7 0 0
+   -1 sprites/mono.png 295  30 01 13 7 0 0
+   -1 sprites/mono.png 310  30 01 13 7 0 0
+   -1 sprites/mono.png 325  30 01 13 7 0 0
+   -1 sprites/mono.png 340  30 01 13 7 0 0
+   -1 sprites/mono.png 355  30 01 13 7 0 0
+   -1 sprites/mono.png 370  30 01 13 7 0 0
+   -1 sprites/mono.png 385  30 01 13 7 0 0
+   -1 sprites/mono.png 400  30 01 13 7 0 0
+   -1 sprites/mono.png 415  30 01 13 7 0 0
+   -1 sprites/mono.png 430  30 01 13 7 0 0
+   -1 sprites/mono.png 445  30 01 13 7 0 0
+   -1 sprites/mono.png 460  30 01 13 7 0 0
+   -1 sprites/mono.png 475  30 01 13 7 0 0
+   -1 sprites/mono.png  10  50 01 13 7 0 0
+   -1 sprites/mono.png  25  50 01 13 7 0 0
+   -1 sprites/mono.png  40  50 01 13 7 0 0
+   -1 sprites/mono.png  55  50 01 13 7 0 0
+   -1 sprites/mono.png  70  50 01 13 7 0 0
+   -1 sprites/mono.png  85  50 01 13 7 0 0
+   -1 sprites/mono.png 100  50 01 13 7 0 0
+   -1 sprites/mono.png 115  50 01 13 7 0 0
+   -1 sprites/mono.png 130  50 01 13 7 0 0
+   -1 sprites/mono.png 145  50 01 13 7 0 0
+   -1 sprites/mono.png 160  50 01 13 7 0 0
+   -1 sprites/mono.png 175  50 01 13 7 0 0
+   -1 sprites/mono.png 190  50 01 13 7 0 0
+   -1 sprites/mono.png 205  50 01 13 7 0 0
+   -1 sprites/mono.png 220  50 01 13 7 0 0
+   -1 sprites/mono.png 235  50 01 13 7 0 0
+   -1 sprites/mono.png 250  50 01 13 7 0 0
+   -1 sprites/mono.png 265  50 01 13 7 0 0
+   -1 sprites/mono.png 280  50 01 13 7 0 0
+   -1 sprites/mono.png 295  50 01 13 7 0 0
+   -1 sprites/mono.png 310  50 01 13 7 0 0
+   -1 sprites/mono.png 325  50 01 13 7 0 0
+   -1 sprites/mono.png 340  50 01 13 7 0 0
+   -1 sprites/mono.png 355  50 01 13 7 0 0
+   -1 sprites/mono.png 370  50 01 13 7 0 0
+   -1 sprites/mono.png 385  50 01 13 7 0 0
+   -1 sprites/mono.png 400  50 01 13 7 0 0
+   -1 sprites/mono.png 415  50 01 13 7 0 0
+   -1 sprites/mono.png 430  50 01 13 7 0 0
+   -1 sprites/mono.png 445  50 01 13 7 0 0
+   -1 sprites/mono.png 460  50 01 13 7 0 0
+   -1 sprites/mono.png 475  50 01 13 7 0 0
+   -1 sprites/mono.png  10  70 01 13 7 0 0
+   -1 sprites/mono.png  25  70 01 13 7 0 0
+   -1 sprites/mono.png  40  70 01 13 7 0 0
+   -1 sprites/mono.png  55  70 01 13 7 0 0
+   -1 sprites/mono.png  70  70 01 13 7 0 0
+   -1 sprites/mono.png  85  70 01 13 7 0 0
+   -1 sprites/mono.png 100  70 01 13 7 0 0
+   -1 sprites/mono.png 115  70 01 13 7 0 0
+   -1 sprites/mono.png 130  70 01 13 7 0 0
+   -1 sprites/mono.png 145  70 01 13 7 0 0
+   -1 sprites/mono.png 160  70 01 13 7 0 0
+   -1 sprites/mono.png 175  70 01 13 7 0 0
+   -1 sprites/mono.png 190  70 01 13 7 0 0
+   -1 sprites/mono.png 205  70 01 13 7 0 0
+   -1 sprites/mono.png 220  70 01 13 7 0 0
+   -1 sprites/mono.png 235  70 01 13 7 0 0
+   -1 sprites/mono.png 250  70 01 13 7 0 0
+   -1 sprites/mono.png 265  70 01 13 7 0 0
+   -1 sprites/mono.png 280  70 01 13 7 0 0
+   -1 sprites/mono.png 295  70 01 13 7 0 0
+   -1 sprites/mono.png 310  70 01 13 7 0 0
+   -1 sprites/mono.png 325  70 01 13 7 0 0
+   -1 sprites/mono.png 340  70 01 13 7 0 0
+   -1 sprites/mono.png 355  70 01 13 7 0 0
+   -1 sprites/mono.png 370  70 01 13 7 0 0
+   -1 sprites/mono.png 385  70 01 13 7 0 0
+   -1 sprites/mono.png 400  70 01 13 7 0 0
+   -1 sprites/mono.png 415  70 01 13 7 0 0
+   -1 sprites/mono.png 430  70 01 13 7 0 0
+   -1 sprites/mono.png 445  70 01 13 7 0 0
+   -1 sprites/mono.png 460  70 01 13 7 0 0
+   -1 sprites/mono.png 475  70 01 13 7 0 0

   -1 * 0 12 01 03 80 80 00
-   -1 sprites/mono.png 8bpp  10   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  25   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  40   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  55   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  70   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  85   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 100   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 115   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 130   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 145   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 160   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 175   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 190   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 205   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 220   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 235   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 250   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 265   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 280   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 295   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 310   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 325   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 340   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 355   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 370   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 385   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 400   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 415   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 430   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 445   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 460   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 475   90   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  10  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  25  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  40  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  55  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  70  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  85  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 100  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 115  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 130  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 145  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 160  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 175  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 190  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 205  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 220  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 235  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 250  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 265  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 280  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 295  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 310  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 325  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 340  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 355  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 370  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 385  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 400  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 415  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 430  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 445  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 460  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 475  110   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  10  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  25  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  40  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  55  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  70  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  85  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 100  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 115  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 130  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 145  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 160  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 175  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 190  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 205  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 220  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 235  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 250  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 265  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 280  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 295  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 310  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 325  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 340  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 355  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 370  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 385  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 400  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 415  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 430  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 445  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 460  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 475  130   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  10  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  25  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  40  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  55  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  70  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp  85  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 100  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 115  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 130  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 145  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 160  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 175  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 190  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 205  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 220  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 235  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 250  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 265  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 280  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 295  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 310  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 325  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 340  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 355  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 370  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 385  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 400  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 415  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 430  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 445  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 460  150   7  13   0   0 normal
-   -1 sprites/mono.png 8bpp 475  150   7  13   0   0 normal
+   -1 sprites/mono.png  10  90 01 13 7 0 0
+   -1 sprites/mono.png  25  90 01 13 7 0 0
+   -1 sprites/mono.png  40  90 01 13 7 0 0
+   -1 sprites/mono.png  55  90 01 13 7 0 0
+   -1 sprites/mono.png  70  90 01 13 7 0 0
+   -1 sprites/mono.png  85  90 01 13 7 0 0
+   -1 sprites/mono.png 100  90 01 13 7 0 0
+   -1 sprites/mono.png 115  90 01 13 7 0 0
+   -1 sprites/mono.png 130  90 01 13 7 0 0
+   -1 sprites/mono.png 145  90 01 13 7 0 0
+   -1 sprites/mono.png 160  90 01 13 7 0 0
+   -1 sprites/mono.png 175  90 01 13 7 0 0
+   -1 sprites/mono.png 190  90 01 13 7 0 0
+   -1 sprites/mono.png 205  90 01 13 7 0 0
+   -1 sprites/mono.png 220  90 01 13 7 0 0
+   -1 sprites/mono.png 235  90 01 13 7 0 0
+   -1 sprites/mono.png 250  90 01 13 7 0 0
+   -1 sprites/mono.png 265  90 01 13 7 0 0
+   -1 sprites/mono.png 280  90 01 13 7 0 0
+   -1 sprites/mono.png 295  90 01 13 7 0 0
+   -1 sprites/mono.png 310  90 01 13 7 0 0
+   -1 sprites/mono.png 325  90 01 13 7 0 0
+   -1 sprites/mono.png 340  90 01 13 7 0 0
+   -1 sprites/mono.png 355  90 01 13 7 0 0
+   -1 sprites/mono.png 370  90 01 13 7 0 0
+   -1 sprites/mono.png 385  90 01 13 7 0 0
+   -1 sprites/mono.png 400  90 01 13 7 0 0
+   -1 sprites/mono.png 415  90 01 13 7 0 0
+   -1 sprites/mono.png 430  90 01 13 7 0 0
+   -1 sprites/mono.png 445  90 01 13 7 0 0
+   -1 sprites/mono.png 460  90 01 13 7 0 0
+   -1 sprites/mono.png 475  90 01 13 7 0 0
+   -1 sprites/mono.png  10 110 01 13 7 0 0
+   -1 sprites/mono.png  25 110 01 13 7 0 0
+   -1 sprites/mono.png  40 110 01 13 7 0 0
+   -1 sprites/mono.png  55 110 01 13 7 0 0
+   -1 sprites/mono.png  70 110 01 13 7 0 0
+   -1 sprites/mono.png  85 110 01 13 7 0 0
+   -1 sprites/mono.png 100 110 01 13 7 0 0
+   -1 sprites/mono.png 115 110 01 13 7 0 0
+   -1 sprites/mono.png 130 110 01 13 7 0 0
+   -1 sprites/mono.png 145 110 01 13 7 0 0
+   -1 sprites/mono.png 160 110 01 13 7 0 0
+   -1 sprites/mono.png 175 110 01 13 7 0 0
+   -1 sprites/mono.png 190 110 01 13 7 0 0
+   -1 sprites/mono.png 205 110 01 13 7 0 0
+   -1 sprites/mono.png 220 110 01 13 7 0 0
+   -1 sprites/mono.png 235 110 01 13 7 0 0
+   -1 sprites/mono.png 250 110 01 13 7 0 0
+   -1 sprites/mono.png 265 110 01 13 7 0 0
+   -1 sprites/mono.png 280 110 01 13 7 0 0
+   -1 sprites/mono.png 295 110 01 13 7 0 0
+   -1 sprites/mono.png 310 110 01 13 7 0 0
+   -1 sprites/mono.png 325 110 01 13 7 0 0
+   -1 sprites/mono.png 340 110 01 13 7 0 0
+   -1 sprites/mono.png 355 110 01 13 7 0 0
+   -1 sprites/mono.png 370 110 01 13 7 0 0
+   -1 sprites/mono.png 385 110 01 13 7 0 0
+   -1 sprites/mono.png 400 110 01 13 7 0 0
+   -1 sprites/mono.png 415 110 01 13 7 0 0
+   -1 sprites/mono.png 430 110 01 13 7 0 0
+   -1 sprites/mono.png 445 110 01 13 7 0 0
+   -1 sprites/mono.png 460 110 01 13 7 0 0
+   -1 sprites/mono.png 475 110 01 13 7 0 0
+   -1 sprites/mono.png  10 130 01 13 7 0 0
+   -1 sprites/mono.png  25 130 01 13 7 0 0
+   -1 sprites/mono.png  40 130 01 13 7 0 0
+   -1 sprites/mono.png  55 130 01 13 7 0 0
+   -1 sprites/mono.png  70 130 01 13 7 0 0
+   -1 sprites/mono.png  85 130 01 13 7 0 0
+   -1 sprites/mono.png 100 130 01 13 7 0 0
+   -1 sprites/mono.png 115 130 01 13 7 0 0
+   -1 sprites/mono.png 130 130 01 13 7 0 0
+   -1 sprites/mono.png 145 130 01 13 7 0 0
+   -1 sprites/mono.png 160 130 01 13 7 0 0
+   -1 sprites/mono.png 175 130 01 13 7 0 0
+   -1 sprites/mono.png 190 130 01 13 7 0 0
+   -1 sprites/mono.png 205 130 01 13 7 0 0
+   -1 sprites/mono.png 220 130 01 13 7 0 0
+   -1 sprites/mono.png 235 130 01 13 7 0 0
+   -1 sprites/mono.png 250 130 01 13 7 0 0
+   -1 sprites/mono.png 265 130 01 13 7 0 0
+   -1 sprites/mono.png 280 130 01 13 7 0 0
+   -1 sprites/mono.png 295 130 01 13 7 0 0
+   -1 sprites/mono.png 310 130 01 13 7 0 0
+   -1 sprites/mono.png 325 130 01 13 7 0 0
+   -1 sprites/mono.png 340 130 01 13 7 0 0
+   -1 sprites/mono.png 355 130 01 13 7 0 0
+   -1 sprites/mono.png 370 130 01 13 7 0 0
+   -1 sprites/mono.png 385 130 01 13 7 0 0
+   -1 sprites/mono.png 400 130 01 13 7 0 0
+   -1 sprites/mono.png 415 130 01 13 7 0 0
+   -1 sprites/mono.png 430 130 01 13 7 0 0
+   -1 sprites/mono.png 445 130 01 13 7 0 0
+   -1 sprites/mono.png 460 130 01 13 7 0 0
+   -1 sprites/mono.png 475 130 01 13 7 0 0
+   -1 sprites/mono.png  10 150 01 13 7 0 0
+   -1 sprites/mono.png  25 150 01 13 7 0 0
+   -1 sprites/mono.png  40 150 01 13 7 0 0
+   -1 sprites/mono.png  55 150 01 13 7 0 0
+   -1 sprites/mono.png  70 150 01 13 7 0 0
+   -1 sprites/mono.png  85 150 01 13 7 0 0
+   -1 sprites/mono.png 100 150 01 13 7 0 0
+   -1 sprites/mono.png 115 150 01 13 7 0 0
+   -1 sprites/mono.png 130 150 01 13 7 0 0
+   -1 sprites/mono.png 145 150 01 13 7 0 0
+   -1 sprites/mono.png 160 150 01 13 7 0 0
+   -1 sprites/mono.png 175 150 01 13 7 0 0
+   -1 sprites/mono.png 190 150 01 13 7 0 0
+   -1 sprites/mono.png 205 150 01 13 7 0 0
+   -1 sprites/mono.png 220 150 01 13 7 0 0
+   -1 sprites/mono.png 235 150 01 13 7 0 0
+   -1 sprites/mono.png 250 150 01 13 7 0 0
+   -1 sprites/mono.png 265 150 01 13 7 0 0
+   -1 sprites/mono.png 280 150 01 13 7 0 0
+   -1 sprites/mono.png 295 150 01 13 7 0 0
+   -1 sprites/mono.png 310 150 01 13 7 0 0
+   -1 sprites/mono.png 325 150 01 13 7 0 0
+   -1 sprites/mono.png 340 150 01 13 7 0 0
+   -1 sprites/mono.png 355 150 01 13 7 0 0
+   -1 sprites/mono.png 370 150 01 13 7 0 0
+   -1 sprites/mono.png 385 150 01 13 7 0 0
+   -1 sprites/mono.png 400 150 01 13 7 0 0
+   -1 sprites/mono.png 415 150 01 13 7 0 0
+   -1 sprites/mono.png 430 150 01 13 7 0 0
+   -1 sprites/mono.png 445 150 01 13 7 0 0
+   -1 sprites/mono.png 460 150 01 13 7 0 0
+   -1 sprites/mono.png 475 150 01 13 7 0 0

 //U+0178 Latin Capital Letter Y With Diaeresis (only needed for mono as it is in the base set, but relocated by some code)
   -1 * 0 12 01 03 01 78 01
-   -1 sprites/mono.png 8bpp 370  230   7  13   0   0 normal
+   -1 sprites/mono.png 370 230 01 13 7 0 0
--- a/media/extra_grf/mono.png
+++ b/media/extra_grf/mono.png
--- a/media/extra_grf/oneway.nfo
+++ b/media/extra_grf/oneway.nfo
@@ -8,9 +8,9 @@
 //
   -1 * 0	 0C "One way road graphics"
   -1 * 3	 05 09 06
-   -1 sprites/oneway.png 8bpp  34    8  24  16 -12  -8 normal
-   -1 sprites/oneway.png 8bpp  66    8  24  16 -12  -8 normal
-   -1 sprites/oneway.png 8bpp  98    8  24  16 -12  -8 normal
-   -1 sprites/oneway.png 8bpp 130    8  24  16 -12  -8 normal
-   -1 sprites/oneway.png 8bpp 162    8  24  16 -12  -8 normal
-   -1 sprites/oneway.png 8bpp 194    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 34 8 01 16 24 -12 -8
+   -1 sprites/oneway.png 66 8 01 16 24 -12 -8
+   -1 sprites/oneway.png 98 8 01 16 24 -12 -8
+   -1 sprites/oneway.png 130 8 01 16 24 -12 -8
+   -1 sprites/oneway.png 162 8 01 16 24 -12 -8
+   -1 sprites/oneway.png 194 8 01 16 24 -12 -8
--- a/media/extra_grf/openttd.nfo
+++ b/media/extra_grf/openttd.nfo
@@ -1,6 +1,6 @@
 // Automatically generated by GRFCODEC. Do not modify!
-// (Info version 32)
-// Format: spritenum imagefile depth xpos ypos xsize ysize xrel yrel zoom flags
+// (Info version 7)
+// Format: spritenum.pngfile xpos ypos compression ysize xsize xrel yrel
 //
 // $Id$
 //
@@ -14,6 +14,13 @@
 // allowing it to be used.
 //

+//
+// -- NFO Renum 'settings' --
+// Do not make nforenum warn about the fact that we use a reserved GRF ID
+// @@WARNING DISABLE 101
+// -- End of NFO Renum 'settings' --
+//
+
 //
 // Number of sprites, it is wrong, but GRFcodec automagically gets it right.
 //
@@ -103,4 +110,3 @@
 #include "rivers/arctic.nfo"
 #include "rivers/tropic.nfo"
 #include "rivers/toyland.nfo"
-#include "tunnel_portals.nfo"
--- a/media/extra_grf/openttdgui.nfo
+++ b/media/extra_grf/openttdgui.nfo
@@ -5,168 +5,179 @@
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+//
+// -- NFO Renum 'settings' --
+// Do not make nforenum warn about the fact that we use more sprites.
+// We are the 'authority' on how many sprites may be used.
+// @@WARNING DISABLE 60
+// -- End of NFO Renum 'settings' --
 //
   -1 * 0	 0C "OpenTTD GUI graphics"
   -1 * 3	 05 15 A2
-   -1 sprites/openttdgui.png 8bpp  66    8  64  31 -31   7 normal
-   -1 sprites/openttdgui.png 8bpp 146    8  64  31 -31   7 normal
-   -1 sprites/openttdgui.png 8bpp 226    8  64  31 -31   7 normal
-   -1 sprites/openttdgui.png 8bpp 306    8  64  31 -31   7 normal
-   -1 sprites/openttdgui.png 8bpp 386    8  64  31 -31  -1 normal
-   -1 sprites/openttdgui.png 8bpp 466    8  64  39 -31  -1 normal
-   -1 sprites/openttdgui.png 8bpp 546    8  64  31 -31  -1 normal
-   -1 sprites/openttdgui.png 8bpp 626    8  64  23 -31   7 normal
-   -1 sprites/openttdgui.png 8bpp 706    8  64  31 -31   7 normal
-   -1 sprites/openttdgui.png 8bpp   2   72  64  23 -31   7 normal
-   -1 sprites/openttdgui.png 8bpp  82   72  64  31 -31   7 normal
-   -1 sprites/openttdgui.png 8bpp 162   72  64  39 -31  -1 normal
-   -1 sprites/openttdgui.png 8bpp 242   72  23  26   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 274   72  24  26   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 306   72   4   8  28  16 normal
-   -1 sprites/openttdgui.png 8bpp 322   72   4   9   0   1 normal
-   -1 sprites/openttdgui.png 8bpp 338   72  32  23   0   1 normal
-   -1 sprites/openttdgui.png 8bpp 386   72   4   8 -31  15 normal
-   -1 sprites/openttdgui.png 8bpp 402   72   4   9  -3   0 normal
-   -1 sprites/openttdgui.png 8bpp 418   72  32  23 -31   0 normal
-   -1 sprites/openttdgui.png 8bpp 466   72   4   8  28  16 normal
-   -1 sprites/openttdgui.png 8bpp 482   72   4   9   0   1 normal
-   -1 sprites/openttdgui.png 8bpp 498   72  32  23   0   1 normal
-   -1 sprites/openttdgui.png 8bpp 546   72   4   8 -31  15 normal
-   -1 sprites/openttdgui.png 8bpp 562   72   4   9  -3   0 normal
-   -1 sprites/openttdgui.png 8bpp 578   72  32  23 -31   0 normal
-   -1 sprites/openttdgui.png 8bpp 626   72   4   8  28  16 normal
-   -1 sprites/openttdgui.png 8bpp 642   72   4   9   0   1 normal
-   -1 sprites/openttdgui.png 8bpp 658   72  32  23   0   1 normal
-   -1 sprites/openttdgui.png 8bpp 706   72   4   8 -31  15 normal
-   -1 sprites/openttdgui.png 8bpp 722   72   4   9  -3   0 normal
-   -1 sprites/openttdgui.png 8bpp 738   72  32  23 -31   0 normal
-   -1 sprites/openttdgui.png 8bpp 786   72   4   8  28  16 normal
-   -1 sprites/openttdgui.png 8bpp   2  136   4   9   0   1 normal
-   -1 sprites/openttdgui.png 8bpp  18  136  32  23   0   1 normal
-   -1 sprites/openttdgui.png 8bpp  66  136   4   8 -31  15 normal
-   -1 sprites/openttdgui.png 8bpp  82  136   4   9  -3   0 normal
-   -1 sprites/openttdgui.png 8bpp  98  136  32  23 -31   0 normal
-   -1 sprites/openttdgui.png 8bpp 146  136  10  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 162  136   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 178  136   7   9   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 194  136   9   7   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 210  136   9   7   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 226  136  10  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 242  136   7   7   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 258  136   7   4   1   2 normal
-   -1 sprites/openttdgui.png 8bpp 274  136   7   4   1   2 normal
-   -1 sprites/openttdgui.png 8bpp 290  136   4   7   1   1 normal
-   -1 sprites/openttdgui.png 8bpp 306  136   4   7   2   1 normal
-   -1 sprites/openttdgui.png 8bpp 322  136   8   8   1   1 normal
-   -1 sprites/openttdgui.png 8bpp 338  136   9   9   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 354  136   7   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 370  136   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 386  136  20  13   0   4 normal
-   -1 sprites/openttdgui.png 8bpp 418  136  56  36   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 482  136  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 514  136  32  32   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 562  136  20  16   0   3 normal
-   -1 sprites/openttdgui.png 8bpp 594  136  56  43   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 658  136  20  19   0   1 normal
-   -1 sprites/openttdgui.png 8bpp 690  136  32  32   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 738  136  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp   2  200  31  31   1   1 normal
-   -1 sprites/openttdgui.png 8bpp  50  200  20  15   0   3 normal
-   -1 sprites/openttdgui.png 8bpp  82  200  56  36   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 146  200  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 178  200  32  32   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 226  200  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 258  200  32  32   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 306  200  19  11   0   6 normal
-   -1 sprites/openttdgui.png 8bpp 338  200  56  36   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 402  200  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 434  200  32  32   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 482  200  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 514  200  32  32   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 562  200  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 594  200  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 626  200  52  32   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 690  200  29  33 -27 -16 normal
-   -1 sprites/openttdgui.png 8bpp 738  200  35  39 -29 -29 normal
-   -1 sprites/openttdgui.png 8bpp   2  264  29  34   1 -17 normal
-   -1 sprites/openttdgui.png 8bpp  50  264  34  39  -3 -28 normal
-   -1 sprites/openttdgui.png 8bpp  98  264  20  13   0   4 normal
-   -1 sprites/openttdgui.png 8bpp 130  264  56  36   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 194  264  20  13   0   4 normal
-   -1 sprites/openttdgui.png 8bpp 226  264  56  36   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 290  264  39  18  -9  -9 normal
-   -1 sprites/openttdgui.png 8bpp 338  264  72  44 -16 -35 normal
-   -1 sprites/openttdgui.png 8bpp 418  264  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 450  264  72  44 -16 -35 normal
-   -1 sprites/openttdgui.png 8bpp 530  264  18  18   1   1 normal
-   -1 sprites/openttdgui.png 8bpp 562  264  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 594  264  32  32   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 642  264  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 674  264  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 706  264  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 738  264  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 770  264  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp   2  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp  34  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp  66  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp  98  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 130  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 162  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 194  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 226  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 258  328  16  16   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 290  328  16  16   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 322  328  16  16   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 354  328  16  16   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 386  328  35  31   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 434  328  33  30   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 482  328  36  33   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 530  328  37  33   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 578  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 610  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 642  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 674  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 706  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 738  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 770  328  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp   2  376  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp  34  376  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp  66  376  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp  98  376  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 130  376  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 162  376  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 194  376  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 226  376  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 258  376  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 290  376  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 322  376  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 354  376  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 386  376  18  18   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 418  376  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 450  376  19  22   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 482  376  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 514  376  54  44 -16 -35 normal
-   -1 sprites/openttdgui.png 8bpp 578  376   7   7   3   4 normal
-   -1 sprites/openttdgui.png 8bpp 594  376   7   7   3   4 normal
-   -1 sprites/openttdgui.png 8bpp 610  376  10   9   2   3 normal
-   -1 sprites/openttdgui.png 8bpp 626  376  10   9   2   3 normal
-   -1 sprites/openttdgui.png 8bpp 642  376  11   7   2   1 normal
-   -1 sprites/openttdgui.png 8bpp 658  376   9   9   3   3 normal
-   -1 sprites/openttdgui.png 8bpp 674  376  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 706  376  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 738  376  32  32   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 786  376  10  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp   2  440  10  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp  18  440   7   7   0   0 normal
-   -1 sprites/openttdgui.png 8bpp  34  440  14  13   4   4 normal
-   -1 sprites/openttdgui.png 8bpp  66  440   7   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp  82  440   7   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp  98  440   7   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 114  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 130  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 146  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 162  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 178  440   8  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 194  440  13  10   0  -2 normal
-   -1 sprites/openttdgui.png 8bpp 215  440   9  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 232  440   8  10   0   0 normal
+   -1 sprites/openttdgui.png 66 8 09 31 64 -31 7
+   -1 sprites/openttdgui.png 146 8 09 31 64 -31 7
+   -1 sprites/openttdgui.png 226 8 09 31 64 -31 7
+   -1 sprites/openttdgui.png 306 8 09 31 64 -31 7
+   -1 sprites/openttdgui.png 386 8 09 31 64 -31 -1
+   -1 sprites/openttdgui.png 466 8 09 39 64 -31 -1
+   -1 sprites/openttdgui.png 546 8 09 31 64 -31 -1
+   -1 sprites/openttdgui.png 626 8 09 23 64 -31 7
+   -1 sprites/openttdgui.png 706 8 09 31 64 -31 7
+   -1 sprites/openttdgui.png 2 72 09 23 64 -31 7
+   -1 sprites/openttdgui.png 82 72 09 31 64 -31 7
+   -1 sprites/openttdgui.png 162 72 09 39 64 -31 -1
+   -1 sprites/openttdgui.png 242 72 01 26 23 0 0
+   -1 sprites/openttdgui.png 274 72 09 26 24 0 0
+   -1 sprites/openttdgui.png 306 72 01 8 4 28 16
+   -1 sprites/openttdgui.png 322 72 01 9 4 0 1
+   -1 sprites/openttdgui.png 338 72 09 23 32 0 1
+   -1 sprites/openttdgui.png 386 72 01 8 4 -31 15
+   -1 sprites/openttdgui.png 402 72 01 9 4 -3 0
+   -1 sprites/openttdgui.png 418 72 09 23 32 -31 0
+   -1 sprites/openttdgui.png 466 72 01 8 4 28 16
+   -1 sprites/openttdgui.png 482 72 01 9 4 0 1
+   -1 sprites/openttdgui.png 498 72 09 23 32 0 1
+   -1 sprites/openttdgui.png 546 72 01 8 4 -31 15
+   -1 sprites/openttdgui.png 562 72 01 9 4 -3 0
+   -1 sprites/openttdgui.png 578 72 09 23 32 -31 0
+   -1 sprites/openttdgui.png 626 72 01 8 4 28 16
+   -1 sprites/openttdgui.png 642 72 01 9 4 0 1
+   -1 sprites/openttdgui.png 658 72 09 23 32 0 1
+   -1 sprites/openttdgui.png 706 72 01 8 4 -31 15
+   -1 sprites/openttdgui.png 722 72 01 9 4 -3 0
+   -1 sprites/openttdgui.png 738 72 09 23 32 -31 0
+   -1 sprites/openttdgui.png 786 72 01 8 4 28 16
+   -1 sprites/openttdgui.png 2 136 01 9 4 0 1
+   -1 sprites/openttdgui.png 18 136 09 23 32 0 1
+   -1 sprites/openttdgui.png 66 136 01 8 4 -31 15
+   -1 sprites/openttdgui.png 82 136 01 9 4 -3 0
+   -1 sprites/openttdgui.png 98 136 09 23 32 -31 0
+   -1 sprites/openttdgui.png 146 136 09 10 10 0 0
+   -1 sprites/openttdgui.png 162 136 01 8 8 0 0
+   -1 sprites/openttdgui.png 178 136 09 9 7 0 0
+   -1 sprites/openttdgui.png 194 136 01 7 9 0 0
+   -1 sprites/openttdgui.png 210 136 01 7 9 0 0
+   -1 sprites/openttdgui.png 226 136 01 10 10 0 0
+   -1 sprites/openttdgui.png 242 136 09 7 7 0 0
+   -1 sprites/openttdgui.png 258 136 09 4 7 1 2
+   -1 sprites/openttdgui.png 274 136 09 4 7 1 2
+   -1 sprites/openttdgui.png 290 136 09 7 4 1 1
+   -1 sprites/openttdgui.png 306 136 09 7 4 2 1
+   -1 sprites/openttdgui.png 322 136 01 8 8 1 1
+   -1 sprites/openttdgui.png 338 136 01 9 9 0 0
+   -1 sprites/openttdgui.png 354 136 01 8 7 0 0
+   -1 sprites/openttdgui.png 370 136 01 8 8 0 0
+   -1 sprites/openttdgui.png 386 136 09 13 20 0 4
+   -1 sprites/openttdgui.png 418 136 03 36 56 0 0
+   -1 sprites/openttdgui.png 482 136 01 20 20 0 0
+   -1 sprites/openttdgui.png 514 136 01 32 32 0 0
+   -1 sprites/openttdgui.png 562 136 09 16 20 0 3
+   -1 sprites/openttdgui.png 594 136 03 43 56 0 0
+   -1 sprites/openttdgui.png 658 136 01 19 20 0 1
+   -1 sprites/openttdgui.png 690 136 01 32 32 0 0
+   -1 sprites/openttdgui.png 738 136 01 20 20 0 0
+   -1 sprites/openttdgui.png 2 200 01 31 31 1 1
+   -1 sprites/openttdgui.png 50 200 09 15 20 0 3
+   -1 sprites/openttdgui.png 82 200 03 36 56 0 0
+   -1 sprites/openttdgui.png 146 200 01 20 20 0 0
+   -1 sprites/openttdgui.png 178 200 01 32 32 0 0
+   -1 sprites/openttdgui.png 226 200 01 20 20 0 0
+   -1 sprites/openttdgui.png 258 200 01 32 32 0 0
+   -1 sprites/openttdgui.png 306 200 09 11 19 0 6
+   -1 sprites/openttdgui.png 338 200 03 36 56 0 0
+   -1 sprites/openttdgui.png 402 200 01 20 20 0 0
+   -1 sprites/openttdgui.png 434 200 01 32 32 0 0
+   -1 sprites/openttdgui.png 482 200 01 20 20 0 0
+   -1 sprites/openttdgui.png 514 200 01 32 32 0 0
+   -1 sprites/openttdgui.png 562 200 09 20 20 0 0
+   -1 sprites/openttdgui.png 594 200 09 20 20 0 0
+   -1 sprites/openttdgui.png 626 200 03 32 52 0 0
+   -1 sprites/openttdgui.png 690 200 09 33 29 -27 -16
+   -1 sprites/openttdgui.png 738 200 09 39 35 -29 -29
+   -1 sprites/openttdgui.png 2 264 09 34 29 1 -17
+   -1 sprites/openttdgui.png 50 264 09 39 34 -3 -28
+   -1 sprites/openttdgui.png 98 264 09 13 20 0 4
+   -1 sprites/openttdgui.png 130 264 03 36 56 0 0
+   -1 sprites/openttdgui.png 194 264 09 13 20 0 4
+   -1 sprites/openttdgui.png 226 264 03 36 56 0 0
+   -1 sprites/openttdgui.png 290 264 01 18 39 -9 -9
+   -1 sprites/openttdgui.png 338 264 01 44 72 -16 -35
+   -1 sprites/openttdgui.png 418 264 01 20 20 0 0
+   -1 sprites/openttdgui.png 450 264 01 44 72 -16 -35
+   -1 sprites/openttdgui.png 530 264 09 18 18 1 1
+   -1 sprites/openttdgui.png 562 264 01 20 20 0 0
+   -1 sprites/openttdgui.png 594 264 01 32 32 0 0
+   -1 sprites/openttdgui.png 642 264 01 18 18 0 0
+   -1 sprites/openttdgui.png 674 264 01 18 18 0 0
+   -1 sprites/openttdgui.png 706 264 01 18 18 0 0
+   -1 sprites/openttdgui.png 738 264 01 18 18 0 0
+   -1 sprites/openttdgui.png 770 264 01 18 18 0 0
+   -1 sprites/openttdgui.png 2 328 01 18 18 0 0
+   -1 sprites/openttdgui.png 34 328 01 18 18 0 0
+   -1 sprites/openttdgui.png 66 328 01 18 18 0 0
+   -1 sprites/openttdgui.png 98 328 01 18 18 0 0
+   -1 sprites/openttdgui.png 130 328 01 18 18 0 0
+   -1 sprites/openttdgui.png 162 328 01 18 18 0 0
+   -1 sprites/openttdgui.png 194 328 01 18 18 0 0
+   -1 sprites/openttdgui.png 226 328 01 18 18 0 0
+   -1 sprites/openttdgui.png 258 328 09 16 16 0 0
+   -1 sprites/openttdgui.png 290 328 01 16 16 0 0
+   -1 sprites/openttdgui.png 322 328 01 16 16 0 0
+   -1 sprites/openttdgui.png 354 328 01 16 16 0 0
+   -1 sprites/openttdgui.png 386 328 09 31 35 0 0
+   -1 sprites/openttdgui.png 434 328 01 30 33 0 0
+   -1 sprites/openttdgui.png 482 328 01 33 36 0 0
+   -1 sprites/openttdgui.png 530 328 01 33 37 0 0
+   -1 sprites/openttdgui.png 578 328 09 18 18 0 0
+   -1 sprites/openttdgui.png 610 328 09 18 18 0 0
+   -1 sprites/openttdgui.png 642 328 09 18 18 0 0
+   -1 sprites/openttdgui.png 674 328 09 18 18 0 0
+   -1 sprites/openttdgui.png 706 328 09 18 18 0 0
+   -1 sprites/openttdgui.png 738 328 09 18 18 0 0
+   -1 sprites/openttdgui.png 770 328 09 18 18 0 0
+   -1 sprites/openttdgui.png 2 376 09 18 18 0 0
+   -1 sprites/openttdgui.png 34 376 09 18 18 0 0
+   -1 sprites/openttdgui.png 66 376 09 18 18 0 0
+   -1 sprites/openttdgui.png 98 376 09 18 18 0 0
+   -1 sprites/openttdgui.png 130 376 09 18 18 0 0
+   -1 sprites/openttdgui.png 162 376 09 18 18 0 0
+   -1 sprites/openttdgui.png 194 376 09 18 18 0 0
+   -1 sprites/openttdgui.png 226 376 09 18 18 0 0
+   -1 sprites/openttdgui.png 258 376 09 18 18 0 0
+   -1 sprites/openttdgui.png 290 376 09 18 18 0 0
+   -1 sprites/openttdgui.png 322 376 09 18 18 0 0
+   -1 sprites/openttdgui.png 354 376 09 18 18 0 0
+   -1 sprites/openttdgui.png 386 376 09 18 18 0 0
+   -1 sprites/openttdgui.png 418 376 01 20 20 0 0
+   -1 sprites/openttdgui.png 450 376 01 22 19 0 0
+   -1 sprites/openttdgui.png 482 376 01 20 20 0 0
+   -1 sprites/openttdgui.png 514 376 01 44 54 -16 -35
+   -1 sprites/openttdgui.png 578 376 01 7 7 3 4
+   -1 sprites/openttdgui.png 594 376 01 7 7 3 4
+   -1 sprites/openttdgui.png 610 376 01 9 10 2 3
+   -1 sprites/openttdgui.png 626 376 01 9 10 2 3
+   -1 sprites/openttdgui.png 642 376 01 7 11 2 1
+   -1 sprites/openttdgui.png 658 376 01 9 9 3 3
+   -1 sprites/openttdgui.png 674 376 09 20 20 0 0
+   -1 sprites/openttdgui.png 706 376 09 20 20 0 0
+   -1 sprites/openttdgui.png 738 376 09 32 32 0 0
+   -1 sprites/openttdgui.png 786 376 09 10 10 0 0
+   -1 sprites/openttdgui.png 2 440 09 10 10 0 0
+   -1 sprites/openttdgui.png 18 440 09 7 7 0 0
+   -1 sprites/openttdgui.png 34 440 09 13 14 4 4
+   -1 sprites/openttdgui.png 66 440 09 8 7 0 0
+   -1 sprites/openttdgui.png 82 440 09 8 7 0 0
+   -1 sprites/openttdgui.png 98 440 09 8 7 0 0
+   -1 sprites/openttdgui.png 114 440 01 8 8 0 0
+   -1 sprites/openttdgui.png 130 440 01 8 8 0 0
+   -1 sprites/openttdgui.png 146 440 01 8 8 0 0
+   -1 sprites/openttdgui.png 162 440 01 8 8 0 0
+   -1 sprites/openttdgui.png 178 440 01 10 8 0 0
+   -1 sprites/openttdgui.png 194 440 09 10 13 0 -2
+   -1 sprites/openttdgui.png 215 440 09 10 9 0 0
+   -1 sprites/openttdgui.png 232 440 09 10 8 0 0
+
+// -- NFO Renum 'settings' --
+// Undo disabling the warning
+// @@WARNING ENABLE 60
+// -- End of NFO Renum 'settings' --
--- a/media/extra_grf/openttdgui.png
+++ b/media/extra_grf/openttdgui.png
--- a/media/extra_grf/rivers/arctic.nfo
+++ b/media/extra_grf/rivers/arctic.nfo
@@ -8,271 +8,271 @@
 //
   -1 * 0	 0C "Arctic river graphics by andythenorth (Andrew Parkhouse)"
   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_snowy.png 8bpp  10   10  38  19  -5   0 normal
-   -1 sprites/arctic_snowy.png 8bpp  58   10  38  18  -5  13 normal
-   -1 sprites/arctic_snowy.png 8bpp 106   10  38  18 -31  13 normal
-   -1 sprites/arctic_snowy.png 8bpp 154   10  38  19 -31   0 normal
-   -1 sprites/arctic_snowy.png 8bpp 202   10  19   9  14  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 234   10  16   9  -7  22 normal
-   -1 sprites/arctic_snowy.png 8bpp 266   10  19   9 -31  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 298   10  16   9  -7   0 normal
-   -1 sprites/arctic_snowy.png 8bpp 330   10   8   6  25  13 normal
-   -1 sprites/arctic_snowy.png 8bpp 346   10  12   4  -5  27 normal
-   -1 sprites/arctic_snowy.png 8bpp 364   10   8   6 -31  13 normal
-   -1 sprites/arctic_snowy.png 8bpp 380   10  12   5  -5   0 normal
+   -1 sprites/arctic_snowy.png  10  10 09 19 38  -5  0
+   -1 sprites/arctic_snowy.png  58  10 09 18 38  -5 13
+   -1 sprites/arctic_snowy.png 106  10 09 18 38 -31 13
+   -1 sprites/arctic_snowy.png 154  10 09 19 38 -31  0
+   -1 sprites/arctic_snowy.png 202  10 09  9 19  14 11
+   -1 sprites/arctic_snowy.png 234  10 09  9 16  -7 22
+   -1 sprites/arctic_snowy.png 266  10 09  9 19 -31 11
+   -1 sprites/arctic_snowy.png 298  10 09  9 16  -7  0
+   -1 sprites/arctic_snowy.png 330  10 09  6  8  25 13
+   -1 sprites/arctic_snowy.png 346  10 09  4 12  -5 27
+   -1 sprites/arctic_snowy.png 364  10 09  6  8 -31 13
+   -1 sprites/arctic_snowy.png 380  10 09  5 12  -5  0

-   -1 sprites/arctic_snowy.png 8bpp  10   40  40  11  -7   0 normal
-   -1 sprites/arctic_snowy.png 8bpp  58   40  39  18  -6   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 106   40  38  11 -31  12 normal
-   -1 sprites/arctic_snowy.png 8bpp 154   40  39  18 -31   0 normal
-   -1 sprites/arctic_snowy.png 8bpp 202   40  20   6  13   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 234   40  13   7  -6  16 normal
-   -1 sprites/arctic_snowy.png 8bpp 266   40  20   6 -31  12 normal
-   -1 sprites/arctic_snowy.png 8bpp 298   40  13   7  -5   0 normal
-   -1 sprites/arctic_snowy.png 8bpp 330   40   8   5  25   6 normal
-   -1 sprites/arctic_snowy.png 8bpp 346   40  12   3  -5  20 normal
-   -1 sprites/arctic_snowy.png 8bpp 364   40   8   4 -31  13 normal
-   -1 sprites/arctic_snowy.png 8bpp 380   40  15   4  -7   0 normal
+   -1 sprites/arctic_snowy.png  10  40 09 11 40  -7  0
+   -1 sprites/arctic_snowy.png  58  40 09 18 39  -6  5
+   -1 sprites/arctic_snowy.png 106  40 09 11 38 -31 12
+   -1 sprites/arctic_snowy.png 154  40 09 18 39 -31  0
+   -1 sprites/arctic_snowy.png 202  40 09  6 20  13  5
+   -1 sprites/arctic_snowy.png 234  40 09  7 13  -6 16
+   -1 sprites/arctic_snowy.png 266  40 09  6 20 -31 12
+   -1 sprites/arctic_snowy.png 298  40 09  7 13  -5  0
+   -1 sprites/arctic_snowy.png 330  40 09  5  8  25  6
+   -1 sprites/arctic_snowy.png 346  40 09  3 12  -5 20
+   -1 sprites/arctic_snowy.png 364  40 09  4  8 -31 13
+   -1 sprites/arctic_snowy.png 380  40 09  4 15  -7  0

-   -1 sprites/arctic_snowy.png 8bpp  10   70  38  20  -5  -8 normal
-   -1 sprites/arctic_snowy.png 8bpp  58   70  38  26  -5   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 106   70  37  20 -31  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 154   70  38  27 -31  -8 normal
-   -1 sprites/arctic_snowy.png 8bpp 202   70  16   9  17   3 normal
-   -1 sprites/arctic_snowy.png 8bpp 234   70  15   9  -7  22 normal
-   -1 sprites/arctic_snowy.png 8bpp 266   70  16   9 -31  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 298   70  15   9  -6  -8 normal
-   -1 sprites/arctic_snowy.png 8bpp 330   70   8   7  25   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 346   70  10   5  -4  27 normal
-   -1 sprites/arctic_snowy.png 8bpp 364   70   8   7 -31  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 380   70  12   6  -5  -8 normal
+   -1 sprites/arctic_snowy.png  10  70 09 20 38  -5 -8
+   -1 sprites/arctic_snowy.png  58  70 09 26 38  -5  5
+   -1 sprites/arctic_snowy.png 106  70 09 20 37 -31 11
+   -1 sprites/arctic_snowy.png 154  70 09 27 38 -31 -8
+   -1 sprites/arctic_snowy.png 202  70 09  9 16  17  3
+   -1 sprites/arctic_snowy.png 234  70 09  9 15  -7 22
+   -1 sprites/arctic_snowy.png 266  70 09  9 16 -31 11
+   -1 sprites/arctic_snowy.png 298  70 09  9 15  -6 -8
+   -1 sprites/arctic_snowy.png 330  70 09  7  8  25  5
+   -1 sprites/arctic_snowy.png 346  70 09  5 10  -4 27
+   -1 sprites/arctic_snowy.png 364  70 09  7  8 -31 11
+   -1 sprites/arctic_snowy.png 380  70 09  6 12  -5 -8

-   -1 sprites/arctic_snowy.png 8bpp  10  100  39  18  -6   0 normal
-   -1 sprites/arctic_snowy.png 8bpp  58  100  38  11  -5  12 normal
-   -1 sprites/arctic_snowy.png 8bpp 106  100  39  18 -31   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 154  100  40  11 -32   0 normal
-   -1 sprites/arctic_snowy.png 8bpp 202  100  20   6  13  12 normal
-   -1 sprites/arctic_snowy.png 8bpp 234  100  13   7  -5  16 normal
-   -1 sprites/arctic_snowy.png 8bpp 266  100  20   6 -31   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 298  100  13   7  -6   0 normal
-   -1 sprites/arctic_snowy.png 8bpp 330  100   8   4  26  13 normal
-   -1 sprites/arctic_snowy.png 8bpp 346  100  12   3  -5  20 normal
-   -1 sprites/arctic_snowy.png 8bpp 364  100   8   5 -31   6 normal
-   -1 sprites/arctic_snowy.png 8bpp 380  100  15   4  -6   0 normal
+   -1 sprites/arctic_snowy.png  10 100 09 18 39  -6  0
+   -1 sprites/arctic_snowy.png  58 100 09 11 38  -5 12
+   -1 sprites/arctic_snowy.png 106 100 09 18 39 -31  5
+   -1 sprites/arctic_snowy.png 154 100 09 11 40 -32  0
+   -1 sprites/arctic_snowy.png 202 100 09  6 20  13 12
+   -1 sprites/arctic_snowy.png 234 100 09  7 13  -5 16
+   -1 sprites/arctic_snowy.png 266 100 09  6 20 -31  5
+   -1 sprites/arctic_snowy.png 298 100 09  7 13  -6  0
+   -1 sprites/arctic_snowy.png 330 100 09  4  8  26 13
+   -1 sprites/arctic_snowy.png 346 100 09  3 12  -5 20
+   -1 sprites/arctic_snowy.png 364 100 09  5  8 -31  6
+   -1 sprites/arctic_snowy.png 380 100 09  4 15  -6  0

-   -1 sprites/arctic_snowy.png 8bpp  10  130  38  27  -5  -8 normal
-   -1 sprites/arctic_snowy.png 8bpp  58  130  37  20  -4  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 106  130  37  26 -31   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 154  130  38  20 -31  -8 normal
-   -1 sprites/arctic_snowy.png 8bpp 202  130  16   9  17  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 234  130  15   9  -6  22 normal
-   -1 sprites/arctic_snowy.png 8bpp 266  130  16   9 -31   3 normal
-   -1 sprites/arctic_snowy.png 8bpp 298  130  15   9  -7  -8 normal
-   -1 sprites/arctic_snowy.png 8bpp 330  130   8   7  25  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 346  130  10   5  -4  26 normal
-   -1 sprites/arctic_snowy.png 8bpp 364  130   8   7 -31   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 380  130  12   6  -5  -8 normal
+   -1 sprites/arctic_snowy.png  10 130 09 27 38  -5 -8
+   -1 sprites/arctic_snowy.png  58 130 09 20 37  -4 11
+   -1 sprites/arctic_snowy.png 106 130 09 26 37 -31  5
+   -1 sprites/arctic_snowy.png 154 130 09 20 38 -31 -8
+   -1 sprites/arctic_snowy.png 202 130 09  9 16  17 11
+   -1 sprites/arctic_snowy.png 234 130 09  9 15  -6 22
+   -1 sprites/arctic_snowy.png 266 130 09  9 16 -31  3
+   -1 sprites/arctic_snowy.png 298 130 09  9 15  -7 -8
+   -1 sprites/arctic_snowy.png 330 130 09  7  8  25 11
+   -1 sprites/arctic_snowy.png 346 130 09  5 10  -4 26
+   -1 sprites/arctic_snowy.png 364 130 09  7  8 -31  5
+   -1 sprites/arctic_snowy.png 380 130 09  6 12  -5 -8
   -1 * 7	 02 05 30 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_brown.png 8bpp  10   10  38  19  -5   0 normal
-   -1 sprites/arctic_brown.png 8bpp  58   10  38  18  -5  13 normal
-   -1 sprites/arctic_brown.png 8bpp 106   10  38  18 -31  13 normal
-   -1 sprites/arctic_brown.png 8bpp 154   10  38  19 -31   0 normal
-   -1 sprites/arctic_brown.png 8bpp 202   10  19   9  14  11 normal
-   -1 sprites/arctic_brown.png 8bpp 234   10  16   9  -7  22 normal
-   -1 sprites/arctic_brown.png 8bpp 266   10  19   9 -31  11 normal
-   -1 sprites/arctic_brown.png 8bpp 298   10  16   9  -7   0 normal
-   -1 sprites/arctic_brown.png 8bpp 330   10   8   6  25  13 normal
-   -1 sprites/arctic_brown.png 8bpp 346   10  12   4  -5  27 normal
-   -1 sprites/arctic_brown.png 8bpp 364   10   8   6 -31  13 normal
-   -1 sprites/arctic_brown.png 8bpp 380   10  12   5  -5   0 normal
+   -1 sprites/arctic_brown.png  10  10 09 19 38  -5  0
+   -1 sprites/arctic_brown.png  58  10 09 18 38  -5 13
+   -1 sprites/arctic_brown.png 106  10 09 18 38 -31 13
+   -1 sprites/arctic_brown.png 154  10 09 19 38 -31  0
+   -1 sprites/arctic_brown.png 202  10 09  9 19  14 11
+   -1 sprites/arctic_brown.png 234  10 09  9 16  -7 22
+   -1 sprites/arctic_brown.png 266  10 09  9 19 -31 11
+   -1 sprites/arctic_brown.png 298  10 09  9 16  -7  0
+   -1 sprites/arctic_brown.png 330  10 09  6  8  25 13
+   -1 sprites/arctic_brown.png 346  10 09  4 12  -5 27
+   -1 sprites/arctic_brown.png 364  10 09  6  8 -31 13
+   -1 sprites/arctic_brown.png 380  10 09  5 12  -5  0

-   -1 sprites/arctic_brown.png 8bpp  10   40  40  11  -7   0 normal
-   -1 sprites/arctic_brown.png 8bpp  58   40  39  18  -6   5 normal
-   -1 sprites/arctic_brown.png 8bpp 106   40  38  11 -31  12 normal
-   -1 sprites/arctic_brown.png 8bpp 154   40  39  18 -31   0 normal
-   -1 sprites/arctic_brown.png 8bpp 202   40  20   6  13   5 normal
-   -1 sprites/arctic_brown.png 8bpp 234   40  13   7  -6  16 normal
-   -1 sprites/arctic_brown.png 8bpp 266   40  20   6 -31  12 normal
-   -1 sprites/arctic_brown.png 8bpp 298   40  13   7  -5   0 normal
-   -1 sprites/arctic_brown.png 8bpp 330   40   8   5  25   6 normal
-   -1 sprites/arctic_brown.png 8bpp 346   40  12   3  -5  20 normal
-   -1 sprites/arctic_brown.png 8bpp 364   40   8   4 -31  13 normal
-   -1 sprites/arctic_brown.png 8bpp 380   40  15   4  -7   0 normal
+   -1 sprites/arctic_brown.png  10  40 09 11 40  -7  0
+   -1 sprites/arctic_brown.png  58  40 09 18 39  -6  5
+   -1 sprites/arctic_brown.png 106  40 09 11 38 -31 12
+   -1 sprites/arctic_brown.png 154  40 09 18 39 -31  0
+   -1 sprites/arctic_brown.png 202  40 09  6 20  13  5
+   -1 sprites/arctic_brown.png 234  40 09  7 13  -6 16
+   -1 sprites/arctic_brown.png 266  40 09  6 20 -31 12
+   -1 sprites/arctic_brown.png 298  40 09  7 13  -5  0
+   -1 sprites/arctic_brown.png 330  40 09  5  8  25  6
+   -1 sprites/arctic_brown.png 346  40 09  3 12  -5 20
+   -1 sprites/arctic_brown.png 364  40 09  4  8 -31 13
+   -1 sprites/arctic_brown.png 380  40 09  4 15  -7  0

-   -1 sprites/arctic_brown.png 8bpp  10   70  38  20  -5  -8 normal
-   -1 sprites/arctic_brown.png 8bpp  58   70  38  26  -5   5 normal
-   -1 sprites/arctic_brown.png 8bpp 106   70  37  20 -31  11 normal
-   -1 sprites/arctic_brown.png 8bpp 154   70  38  27 -31  -8 normal
-   -1 sprites/arctic_brown.png 8bpp 202   70  16   9  17   3 normal
-   -1 sprites/arctic_brown.png 8bpp 234   70  15   9  -7  22 normal
-   -1 sprites/arctic_brown.png 8bpp 266   70  16   9 -31  11 normal
-   -1 sprites/arctic_brown.png 8bpp 298   70  15   9  -6  -8 normal
-   -1 sprites/arctic_brown.png 8bpp 330   70   8   7  25   5 normal
-   -1 sprites/arctic_brown.png 8bpp 346   70  10   5  -4  27 normal
-   -1 sprites/arctic_brown.png 8bpp 364   70   8   7 -31  11 normal
-   -1 sprites/arctic_brown.png 8bpp 380   70  12   6  -5  -8 normal
+   -1 sprites/arctic_brown.png  10  70 09 20 38  -5 -8
+   -1 sprites/arctic_brown.png  58  70 09 26 38  -5  5
+   -1 sprites/arctic_brown.png 106  70 09 20 37 -31 11
+   -1 sprites/arctic_brown.png 154  70 09 27 38 -31 -8
+   -1 sprites/arctic_brown.png 202  70 09  9 16  17  3
+   -1 sprites/arctic_brown.png 234  70 09  9 15  -7 22
+   -1 sprites/arctic_brown.png 266  70 09  9 16 -31 11
+   -1 sprites/arctic_brown.png 298  70 09  9 15  -6 -8
+   -1 sprites/arctic_brown.png 330  70 09  7  8  25  5
+   -1 sprites/arctic_brown.png 346  70 09  5 10  -4 27
+   -1 sprites/arctic_brown.png 364  70 09  7  8 -31 11
+   -1 sprites/arctic_brown.png 380  70 09  6 12  -5 -8

-   -1 sprites/arctic_brown.png 8bpp  10  100  39  18  -6   0 normal
-   -1 sprites/arctic_brown.png 8bpp  58  100  38  11  -5  12 normal
-   -1 sprites/arctic_brown.png 8bpp 106  100  39  18 -31   5 normal
-   -1 sprites/arctic_brown.png 8bpp 154  100  40  11 -32   0 normal
-   -1 sprites/arctic_brown.png 8bpp 202  100  20   6  13  12 normal
-   -1 sprites/arctic_brown.png 8bpp 234  100  13   7  -5  16 normal
-   -1 sprites/arctic_brown.png 8bpp 266  100  20   6 -31   5 normal
-   -1 sprites/arctic_brown.png 8bpp 298  100  13   7  -6   0 normal
-   -1 sprites/arctic_brown.png 8bpp 330  100   8   4  26  13 normal
-   -1 sprites/arctic_brown.png 8bpp 346  100  12   3  -5  20 normal
-   -1 sprites/arctic_brown.png 8bpp 364  100   8   5 -31   6 normal
-   -1 sprites/arctic_brown.png 8bpp 380  100  15   4  -6   0 normal
+   -1 sprites/arctic_brown.png  10 100 09 18 39  -6  0
+   -1 sprites/arctic_brown.png  58 100 09 11 38  -5 12
+   -1 sprites/arctic_brown.png 106 100 09 18 39 -31  5
+   -1 sprites/arctic_brown.png 154 100 09 11 40 -32  0
+   -1 sprites/arctic_brown.png 202 100 09  6 20  13 12
+   -1 sprites/arctic_brown.png 234 100 09  7 13  -5 16
+   -1 sprites/arctic_brown.png 266 100 09  6 20 -31  5
+   -1 sprites/arctic_brown.png 298 100 09  7 13  -6  0
+   -1 sprites/arctic_brown.png 330 100 09  4  8  26 13
+   -1 sprites/arctic_brown.png 346 100 09  3 12  -5 20
+   -1 sprites/arctic_brown.png 364 100 09  5  8 -31  6
+   -1 sprites/arctic_brown.png 380 100 09  4 15  -6  0

-   -1 sprites/arctic_brown.png 8bpp  10  130  38  27  -5  -8 normal
-   -1 sprites/arctic_brown.png 8bpp  58  130  37  20  -4  11 normal
-   -1 sprites/arctic_brown.png 8bpp 106  130  37  26 -31   5 normal
-   -1 sprites/arctic_brown.png 8bpp 154  130  38  20 -31  -8 normal
-   -1 sprites/arctic_brown.png 8bpp 202  130  16   9  17  11 normal
-   -1 sprites/arctic_brown.png 8bpp 234  130  15   9  -6  22 normal
-   -1 sprites/arctic_brown.png 8bpp 266  130  16   9 -31   3 normal
-   -1 sprites/arctic_brown.png 8bpp 298  130  15   9  -7  -8 normal
-   -1 sprites/arctic_brown.png 8bpp 330  130   8   7  25  11 normal
-   -1 sprites/arctic_brown.png 8bpp 346  130  10   5  -4  26 normal
-   -1 sprites/arctic_brown.png 8bpp 364  130   8   7 -31   5 normal
-   -1 sprites/arctic_brown.png 8bpp 380  130  12   6  -5  -8 normal
+   -1 sprites/arctic_brown.png  10 130 09 27 38  -5 -8
+   -1 sprites/arctic_brown.png  58 130 09 20 37  -4 11
+   -1 sprites/arctic_brown.png 106 130 09 26 37 -31  5
+   -1 sprites/arctic_brown.png 154 130 09 20 38 -31 -8
+   -1 sprites/arctic_brown.png 202 130 09  9 16  17 11
+   -1 sprites/arctic_brown.png 234 130 09  9 15  -6 22
+   -1 sprites/arctic_brown.png 266 130 09  9 16 -31  3
+   -1 sprites/arctic_brown.png 298 130 09  9 15  -7 -8
+   -1 sprites/arctic_brown.png 330 130 09  7  8  25 11
+   -1 sprites/arctic_brown.png 346 130 09  5 10  -4 26
+   -1 sprites/arctic_brown.png 364 130 09  7  8 -31  5
+   -1 sprites/arctic_brown.png 380 130 09  6 12  -5 -8
   -1 * 7	 02 05 31 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_snowy.png 8bpp  10  210  38  19  -5   0 normal
-   -1 sprites/arctic_snowy.png 8bpp  58  210  38  18  -5  13 normal
-   -1 sprites/arctic_snowy.png 8bpp 106  210  38  18 -31  13 normal
-   -1 sprites/arctic_snowy.png 8bpp 154  210  38  19 -31   0 normal
-   -1 sprites/arctic_snowy.png 8bpp 202  210  19   9  14  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 234  210  16   9  -7  22 normal
-   -1 sprites/arctic_snowy.png 8bpp 266  210  19   9 -31  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 298  210  16   9  -7   0 normal
-   -1 sprites/arctic_snowy.png 8bpp 330  210   8   6  25  13 normal
-   -1 sprites/arctic_snowy.png 8bpp 346  210  12   4  -5  27 normal
-   -1 sprites/arctic_snowy.png 8bpp 364  210   8   6 -31  13 normal
-   -1 sprites/arctic_snowy.png 8bpp 380  210  12   5  -5   0 normal
+   -1 sprites/arctic_snowy.png  10 210 09 19 38  -5  0
+   -1 sprites/arctic_snowy.png  58 210 09 18 38  -5 13
+   -1 sprites/arctic_snowy.png 106 210 09 18 38 -31 13
+   -1 sprites/arctic_snowy.png 154 210 09 19 38 -31  0
+   -1 sprites/arctic_snowy.png 202 210 09  9 19  14 11
+   -1 sprites/arctic_snowy.png 234 210 09  9 16  -7 22
+   -1 sprites/arctic_snowy.png 266 210 09  9 19 -31 11
+   -1 sprites/arctic_snowy.png 298 210 09  9 16  -7  0
+   -1 sprites/arctic_snowy.png 330 210 09  6  8  25 13
+   -1 sprites/arctic_snowy.png 346 210 09  4 12  -5 27
+   -1 sprites/arctic_snowy.png 364 210 09  6  8 -31 13
+   -1 sprites/arctic_snowy.png 380 210 09  5 12  -5  0

-   -1 sprites/arctic_snowy.png 8bpp  10  240  40  11  -7   0 normal
-   -1 sprites/arctic_snowy.png 8bpp  58  240  39  18  -6   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 106  240  38  11 -31  12 normal
-   -1 sprites/arctic_snowy.png 8bpp 154  240  39  18 -31   0 normal
-   -1 sprites/arctic_snowy.png 8bpp 202  240  20   6  13   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 234  240  13   7  -6  16 normal
-   -1 sprites/arctic_snowy.png 8bpp 266  240  20   6 -31  12 normal
-   -1 sprites/arctic_snowy.png 8bpp 298  240  13   7  -5   0 normal
-   -1 sprites/arctic_snowy.png 8bpp 330  240   8   5  25   6 normal
-   -1 sprites/arctic_snowy.png 8bpp 346  240  12   3  -5  20 normal
-   -1 sprites/arctic_snowy.png 8bpp 364  240   8   4 -31  13 normal
-   -1 sprites/arctic_snowy.png 8bpp 380  240  15   4  -7   0 normal
+   -1 sprites/arctic_snowy.png  10 240 09 11 40  -7  0
+   -1 sprites/arctic_snowy.png  58 240 09 18 39  -6  5
+   -1 sprites/arctic_snowy.png 106 240 09 11 38 -31 12
+   -1 sprites/arctic_snowy.png 154 240 09 18 39 -31  0
+   -1 sprites/arctic_snowy.png 202 240 09  6 20  13  5
+   -1 sprites/arctic_snowy.png 234 240 09  7 13  -6 16
+   -1 sprites/arctic_snowy.png 266 240 09  6 20 -31 12
+   -1 sprites/arctic_snowy.png 298 240 09  7 13  -5  0
+   -1 sprites/arctic_snowy.png 330 240 09  5  8  25  6
+   -1 sprites/arctic_snowy.png 346 240 09  3 12  -5 20
+   -1 sprites/arctic_snowy.png 364 240 09  4  8 -31 13
+   -1 sprites/arctic_snowy.png 380 240 09  4 15  -7  0

-   -1 sprites/arctic_snowy.png 8bpp  10  270  38  20  -5  -8 normal
-   -1 sprites/arctic_snowy.png 8bpp  58  270  38  26  -5   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 106  270  37  20 -31  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 154  270  38  27 -31  -8 normal
-   -1 sprites/arctic_snowy.png 8bpp 202  270  16   9  17   3 normal
-   -1 sprites/arctic_snowy.png 8bpp 234  270  15   9  -7  22 normal
-   -1 sprites/arctic_snowy.png 8bpp 266  270  16   9 -31  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 298  270  15   9  -6  -8 normal
-   -1 sprites/arctic_snowy.png 8bpp 330  270   8   7  25   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 346  270  10   5  -4  27 normal
-   -1 sprites/arctic_snowy.png 8bpp 364  270   8   7 -31  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 380  270  12   6  -5  -8 normal
+   -1 sprites/arctic_snowy.png  10 270 09 20 38  -5 -8
+   -1 sprites/arctic_snowy.png  58 270 09 26 38  -5  5
+   -1 sprites/arctic_snowy.png 106 270 09 20 37 -31 11
+   -1 sprites/arctic_snowy.png 154 270 09 27 38 -31 -8
+   -1 sprites/arctic_snowy.png 202 270 09  9 16  17  3
+   -1 sprites/arctic_snowy.png 234 270 09  9 15  -7 22
+   -1 sprites/arctic_snowy.png 266 270 09  9 16 -31 11
+   -1 sprites/arctic_snowy.png 298 270 09  9 15  -6 -8
+   -1 sprites/arctic_snowy.png 330 270 09  7  8  25  5
+   -1 sprites/arctic_snowy.png 346 270 09  5 10  -4 27
+   -1 sprites/arctic_snowy.png 364 270 09  7  8 -31 11
+   -1 sprites/arctic_snowy.png 380 270 09  6 12  -5 -8

-   -1 sprites/arctic_snowy.png 8bpp  10  300  39  18  -6   0 normal
-   -1 sprites/arctic_snowy.png 8bpp  58  300  38  11  -5  12 normal
-   -1 sprites/arctic_snowy.png 8bpp 106  300  39  18 -31   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 154  300  40  11 -32   0 normal
-   -1 sprites/arctic_snowy.png 8bpp 202  300  20   6  13  12 normal
-   -1 sprites/arctic_snowy.png 8bpp 234  300  13   7  -5  16 normal
-   -1 sprites/arctic_snowy.png 8bpp 266  300  20   6 -31   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 298  300  13   7  -6   0 normal
-   -1 sprites/arctic_snowy.png 8bpp 330  300   8   4  26  13 normal
-   -1 sprites/arctic_snowy.png 8bpp 346  300  12   3  -5  20 normal
-   -1 sprites/arctic_snowy.png 8bpp 364  300   8   5 -31   6 normal
-   -1 sprites/arctic_snowy.png 8bpp 380  300  15   4  -6   0 normal
+   -1 sprites/arctic_snowy.png  10 300 09 18 39  -6  0
+   -1 sprites/arctic_snowy.png  58 300 09 11 38  -5 12
+   -1 sprites/arctic_snowy.png 106 300 09 18 39 -31  5
+   -1 sprites/arctic_snowy.png 154 300 09 11 40 -32  0
+   -1 sprites/arctic_snowy.png 202 300 09  6 20  13 12
+   -1 sprites/arctic_snowy.png 234 300 09  7 13  -5 16
+   -1 sprites/arctic_snowy.png 266 300 09  6 20 -31  5
+   -1 sprites/arctic_snowy.png 298 300 09  7 13  -6  0
+   -1 sprites/arctic_snowy.png 330 300 09  4  8  26 13
+   -1 sprites/arctic_snowy.png 346 300 09  3 12  -5 20
+   -1 sprites/arctic_snowy.png 364 300 09  5  8 -31  6
+   -1 sprites/arctic_snowy.png 380 300 09  4 15  -6  0

-   -1 sprites/arctic_snowy.png 8bpp  10  330  38  27  -5  -8 normal
-   -1 sprites/arctic_snowy.png 8bpp  58  330  37  20  -4  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 106  330  37  26 -31   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 154  330  38  20 -31  -8 normal
-   -1 sprites/arctic_snowy.png 8bpp 202  330  16   9  17  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 234  330  15   9  -6  22 normal
-   -1 sprites/arctic_snowy.png 8bpp 266  330  16   9 -31   3 normal
-   -1 sprites/arctic_snowy.png 8bpp 298  330  15   9  -7  -8 normal
-   -1 sprites/arctic_snowy.png 8bpp 330  330   8   7  25  11 normal
-   -1 sprites/arctic_snowy.png 8bpp 346  330  10   5  -4  26 normal
-   -1 sprites/arctic_snowy.png 8bpp 364  330   8   7 -31   5 normal
-   -1 sprites/arctic_snowy.png 8bpp 380  330  12   6  -5  -8 normal
+   -1 sprites/arctic_snowy.png  10 330 09 27 38  -5 -8
+   -1 sprites/arctic_snowy.png  58 330 09 20 37  -4 11
+   -1 sprites/arctic_snowy.png 106 330 09 26 37 -31  5
+   -1 sprites/arctic_snowy.png 154 330 09 20 38 -31 -8
+   -1 sprites/arctic_snowy.png 202 330 09  9 16  17 11
+   -1 sprites/arctic_snowy.png 234 330 09  9 15  -6 22
+   -1 sprites/arctic_snowy.png 266 330 09  9 16 -31  3
+   -1 sprites/arctic_snowy.png 298 330 09  9 15  -7 -8
+   -1 sprites/arctic_snowy.png 330 330 09  7  8  25 11
+   -1 sprites/arctic_snowy.png 346 330 09  5 10  -4 26
+   -1 sprites/arctic_snowy.png 364 330 09  7  8 -31  5
+   -1 sprites/arctic_snowy.png 380 330 09  6 12  -5 -8
   -1 * 7	 02 05 32 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_brown.png 8bpp  10  210  38  19  -5   0 normal
-   -1 sprites/arctic_brown.png 8bpp  58  210  38  18  -5  13 normal
-   -1 sprites/arctic_brown.png 8bpp 106  210  38  18 -31  13 normal
-   -1 sprites/arctic_brown.png 8bpp 154  210  38  19 -31   0 normal
-   -1 sprites/arctic_brown.png 8bpp 202  210  19   9  14  11 normal
-   -1 sprites/arctic_brown.png 8bpp 234  210  16   9  -7  22 normal
-   -1 sprites/arctic_brown.png 8bpp 266  210  19   9 -31  11 normal
-   -1 sprites/arctic_brown.png 8bpp 298  210  16   9  -7   0 normal
-   -1 sprites/arctic_brown.png 8bpp 330  210   8   6  25  13 normal
-   -1 sprites/arctic_brown.png 8bpp 346  210  12   4  -5  27 normal
-   -1 sprites/arctic_brown.png 8bpp 364  210   8   6 -31  13 normal
-   -1 sprites/arctic_brown.png 8bpp 380  210  12   5  -5   0 normal
+   -1 sprites/arctic_brown.png  10 210 09 19 38  -5  0
+   -1 sprites/arctic_brown.png  58 210 09 18 38  -5 13
+   -1 sprites/arctic_brown.png 106 210 09 18 38 -31 13
+   -1 sprites/arctic_brown.png 154 210 09 19 38 -31  0
+   -1 sprites/arctic_brown.png 202 210 09  9 19  14 11
+   -1 sprites/arctic_brown.png 234 210 09  9 16  -7 22
+   -1 sprites/arctic_brown.png 266 210 09  9 19 -31 11
+   -1 sprites/arctic_brown.png 298 210 09  9 16  -7  0
+   -1 sprites/arctic_brown.png 330 210 09  6  8  25 13
+   -1 sprites/arctic_brown.png 346 210 09  4 12  -5 27
+   -1 sprites/arctic_brown.png 364 210 09  6  8 -31 13
+   -1 sprites/arctic_brown.png 380 210 09  5 12  -5  0

-   -1 sprites/arctic_brown.png 8bpp  10  240  40  11  -7   0 normal
-   -1 sprites/arctic_brown.png 8bpp  58  240  39  18  -6   5 normal
-   -1 sprites/arctic_brown.png 8bpp 106  240  38  11 -31  12 normal
-   -1 sprites/arctic_brown.png 8bpp 154  240  39  18 -31   0 normal
-   -1 sprites/arctic_brown.png 8bpp 202  240  20   6  13   5 normal
-   -1 sprites/arctic_brown.png 8bpp 234  240  13   7  -6  16 normal
-   -1 sprites/arctic_brown.png 8bpp 266  240  20   6 -31  12 normal
-   -1 sprites/arctic_brown.png 8bpp 298  240  13   7  -5   0 normal
-   -1 sprites/arctic_brown.png 8bpp 330  240   8   5  25   6 normal
-   -1 sprites/arctic_brown.png 8bpp 346  240  12   3  -5  20 normal
-   -1 sprites/arctic_brown.png 8bpp 364  240   8   4 -31  13 normal
-   -1 sprites/arctic_brown.png 8bpp 380  240  15   4  -7   0 normal
+   -1 sprites/arctic_brown.png  10 240 09 11 40  -7  0
+   -1 sprites/arctic_brown.png  58 240 09 18 39  -6  5
+   -1 sprites/arctic_brown.png 106 240 09 11 38 -31 12
+   -1 sprites/arctic_brown.png 154 240 09 18 39 -31  0
+   -1 sprites/arctic_brown.png 202 240 09  6 20  13  5
+   -1 sprites/arctic_brown.png 234 240 09  7 13  -6 16
+   -1 sprites/arctic_brown.png 266 240 09  6 20 -31 12
+   -1 sprites/arctic_brown.png 298 240 09  7 13  -5  0
+   -1 sprites/arctic_brown.png 330 240 09  5  8  25  6
+   -1 sprites/arctic_brown.png 346 240 09  3 12  -5 20
+   -1 sprites/arctic_brown.png 364 240 09  4  8 -31 13
+   -1 sprites/arctic_brown.png 380 240 09  4 15  -7  0

-   -1 sprites/arctic_brown.png 8bpp  10  270  38  20  -5  -8 normal
-   -1 sprites/arctic_brown.png 8bpp  58  270  38  26  -5   5 normal
-   -1 sprites/arctic_brown.png 8bpp 106  270  37  20 -31  11 normal
-   -1 sprites/arctic_brown.png 8bpp 154  270  38  27 -31  -8 normal
-   -1 sprites/arctic_brown.png 8bpp 202  270  16   9  17   3 normal
-   -1 sprites/arctic_brown.png 8bpp 234  270  15   9  -7  22 normal
-   -1 sprites/arctic_brown.png 8bpp 266  270  16   9 -31  11 normal
-   -1 sprites/arctic_brown.png 8bpp 298  270  15   9  -6  -8 normal
-   -1 sprites/arctic_brown.png 8bpp 330  270   8   7  25   5 normal
-   -1 sprites/arctic_brown.png 8bpp 346  270  10   5  -4  27 normal
-   -1 sprites/arctic_brown.png 8bpp 364  270   8   7 -31  11 normal
-   -1 sprites/arctic_brown.png 8bpp 380  270  12   6  -5  -8 normal
+   -1 sprites/arctic_brown.png  10 270 09 20 38  -5 -8
+   -1 sprites/arctic_brown.png  58 270 09 26 38  -5  5
+   -1 sprites/arctic_brown.png 106 270 09 20 37 -31 11
+   -1 sprites/arctic_brown.png 154 270 09 27 38 -31 -8
+   -1 sprites/arctic_brown.png 202 270 09  9 16  17  3
+   -1 sprites/arctic_brown.png 234 270 09  9 15  -7 22
+   -1 sprites/arctic_brown.png 266 270 09  9 16 -31 11
+   -1 sprites/arctic_brown.png 298 270 09  9 15  -6 -8
+   -1 sprites/arctic_brown.png 330 270 09  7  8  25  5
+   -1 sprites/arctic_brown.png 346 270 09  5 10  -4 27
+   -1 sprites/arctic_brown.png 364 270 09  7  8 -31 11
+   -1 sprites/arctic_brown.png 380 270 09  6 12  -5 -8

-   -1 sprites/arctic_brown.png 8bpp  10  300  39  18  -6   0 normal
-   -1 sprites/arctic_brown.png 8bpp  58  300  38  11  -5  12 normal
-   -1 sprites/arctic_brown.png 8bpp 106  300  39  18 -31   5 normal
-   -1 sprites/arctic_brown.png 8bpp 154  300  40  11 -32   0 normal
-   -1 sprites/arctic_brown.png 8bpp 202  300  20   6  13  12 normal
-   -1 sprites/arctic_brown.png 8bpp 234  300  13   7  -5  16 normal
-   -1 sprites/arctic_brown.png 8bpp 266  300  20   6 -31   5 normal
-   -1 sprites/arctic_brown.png 8bpp 298  300  13   7  -6   0 normal
-   -1 sprites/arctic_brown.png 8bpp 330  300   8   4  26  13 normal
-   -1 sprites/arctic_brown.png 8bpp 346  300  12   3  -5  20 normal
-   -1 sprites/arctic_brown.png 8bpp 364  300   8   5 -31   6 normal
-   -1 sprites/arctic_brown.png 8bpp 380  300  15   4  -6   0 normal
+   -1 sprites/arctic_brown.png  10 300 09 18 39  -6  0
+   -1 sprites/arctic_brown.png  58 300 09 11 38  -5 12
+   -1 sprites/arctic_brown.png 106 300 09 18 39 -31  5
+   -1 sprites/arctic_brown.png 154 300 09 11 40 -32  0
+   -1 sprites/arctic_brown.png 202 300 09  6 20  13 12
+   -1 sprites/arctic_brown.png 234 300 09  7 13  -5 16
+   -1 sprites/arctic_brown.png 266 300 09  6 20 -31  5
+   -1 sprites/arctic_brown.png 298 300 09  7 13  -6  0
+   -1 sprites/arctic_brown.png 330 300 09  4  8  26 13
+   -1 sprites/arctic_brown.png 346 300 09  3 12  -5 20
+   -1 sprites/arctic_brown.png 364 300 09  5  8 -31  6
+   -1 sprites/arctic_brown.png 380 300 09  4 15  -6  0

-   -1 sprites/arctic_brown.png 8bpp  10  330  38  27  -5  -8 normal
-   -1 sprites/arctic_brown.png 8bpp  58  330  37  20  -4  11 normal
-   -1 sprites/arctic_brown.png 8bpp 106  330  37  26 -31   5 normal
-   -1 sprites/arctic_brown.png 8bpp 154  330  38  20 -31  -8 normal
-   -1 sprites/arctic_brown.png 8bpp 202  330  16   9  17  11 normal
-   -1 sprites/arctic_brown.png 8bpp 234  330  15   9  -6  22 normal
-   -1 sprites/arctic_brown.png 8bpp 266  330  16   9 -31   3 normal
-   -1 sprites/arctic_brown.png 8bpp 298  330  15   9  -7  -8 normal
-   -1 sprites/arctic_brown.png 8bpp 330  330   8   7  25  11 normal
-   -1 sprites/arctic_brown.png 8bpp 346  330  10   5  -4  26 normal
-   -1 sprites/arctic_brown.png 8bpp 364  330   8   7 -31   5 normal
-   -1 sprites/arctic_brown.png 8bpp 380  330  12   6  -5  -8 normal
+   -1 sprites/arctic_brown.png  10 330 09 27 38  -5 -8
+   -1 sprites/arctic_brown.png  58 330 09 20 37  -4 11
+   -1 sprites/arctic_brown.png 106 330 09 26 37 -31  5
+   -1 sprites/arctic_brown.png 154 330 09 20 38 -31 -8
+   -1 sprites/arctic_brown.png 202 330 09  9 16  17 11
+   -1 sprites/arctic_brown.png 234 330 09  9 15  -6 22
+   -1 sprites/arctic_brown.png 266 330 09  9 16 -31  3
+   -1 sprites/arctic_brown.png 298 330 09  9 15  -7 -8
+   -1 sprites/arctic_brown.png 330 330 09  7  8  25 11
+   -1 sprites/arctic_brown.png 346 330 09  5 10  -4 26
+   -1 sprites/arctic_brown.png 364 330 09  7  8 -31  5
+   -1 sprites/arctic_brown.png 380 330 09  6 12  -5 -8
   -1 * 7	 02 05 33 01 00 00 00

   -1 * 14	 02 05 34 81 81 00 FF 01 30 00 04 04 31 00
--- a/media/extra_grf/rivers/rapids.nfo
+++ b/media/extra_grf/rivers/rapids.nfo
@@ -8,115 +8,115 @@
 //
   -1 * 0	 0C "Rapid graphics"
   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10   10  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90   10  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170   10  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250   10  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10  10 09 23 64 -31  0
+   -1 sprites/rapids.png  90  10 09 39 64 -31 -8
+   -1 sprites/rapids.png 170  10 09 23 64 -31  0
+   -1 sprites/rapids.png 250  10 09 39 64 -31 -8
   -1 * 7	 02 05 00 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10   60  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90   60  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170   60  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250   60  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10  60 09 23 64 -31  0
+   -1 sprites/rapids.png  90  60 09 39 64 -31 -8
+   -1 sprites/rapids.png 170  60 09 23 64 -31  0
+   -1 sprites/rapids.png 250  60 09 39 64 -31 -8
   -1 * 7	 02 05 01 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10  110  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90  110  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170  110  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250  110  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10 110 09 23 64 -31  0
+   -1 sprites/rapids.png  90 110 09 39 64 -31 -8
+   -1 sprites/rapids.png 170 110 09 23 64 -31  0
+   -1 sprites/rapids.png 250 110 09 39 64 -31 -8
   -1 * 7	 02 05 02 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10  160  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90  160  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170  160  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250  160  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10 160 09 23 64 -31  0
+   -1 sprites/rapids.png  90 160 09 39 64 -31 -8
+   -1 sprites/rapids.png 170 160 09 23 64 -31  0
+   -1 sprites/rapids.png 250 160 09 39 64 -31 -8
   -1 * 7	 02 05 03 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10  210  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90  210  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170  210  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250  210  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10 210 09 23 64 -31  0
+   -1 sprites/rapids.png  90 210 09 39 64 -31 -8
+   -1 sprites/rapids.png 170 210 09 23 64 -31  0
+   -1 sprites/rapids.png 250 210 09 39 64 -31 -8
   -1 * 7	 02 05 04 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10  260  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90  260  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170  260  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250  260  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10 260 09 23 64 -31  0
+   -1 sprites/rapids.png  90 260 09 39 64 -31 -8
+   -1 sprites/rapids.png 170 260 09 23 64 -31  0
+   -1 sprites/rapids.png 250 260 09 39 64 -31 -8
   -1 * 7	 02 05 05 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10  310  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90  310  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170  310  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250  310  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10 310 09 23 64 -31  0
+   -1 sprites/rapids.png  90 310 09 39 64 -31 -8
+   -1 sprites/rapids.png 170 310 09 23 64 -31  0
+   -1 sprites/rapids.png 250 310 09 39 64 -31 -8
   -1 * 7	 02 05 06 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10  360  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90  360  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170  360  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250  360  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10 360 09 23 64 -31  0
+   -1 sprites/rapids.png  90 360 09 39 64 -31 -8
+   -1 sprites/rapids.png 170 360 09 23 64 -31  0
+   -1 sprites/rapids.png 250 360 09 39 64 -31 -8
   -1 * 7	 02 05 07 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10  410  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90  410  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170  410  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250  410  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10 410 09 23 64 -31  0
+   -1 sprites/rapids.png  90 410 09 39 64 -31 -8
+   -1 sprites/rapids.png 170 410 09 23 64 -31  0
+   -1 sprites/rapids.png 250 410 09 39 64 -31 -8
   -1 * 7	 02 05 08 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10  460  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90  460  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170  460  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250  460  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10 460 09 23 64 -31  0
+   -1 sprites/rapids.png  90 460 09 39 64 -31 -8
+   -1 sprites/rapids.png 170 460 09 23 64 -31  0
+   -1 sprites/rapids.png 250 460 09 39 64 -31 -8
   -1 * 7	 02 05 09 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10  510  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90  510  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170  510  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250  510  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10 510 09 23 64 -31  0
+   -1 sprites/rapids.png  90 510 09 39 64 -31 -8
+   -1 sprites/rapids.png 170 510 09 23 64 -31  0
+   -1 sprites/rapids.png 250 510 09 39 64 -31 -8
   -1 * 7	 02 05 0A 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10  560  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90  560  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170  560  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250  560  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10 560 09 23 64 -31  0
+   -1 sprites/rapids.png  90 560 09 39 64 -31 -8
+   -1 sprites/rapids.png 170 560 09 23 64 -31  0
+   -1 sprites/rapids.png 250 560 09 39 64 -31 -8
   -1 * 7	 02 05 0B 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10  610  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90  610  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170  610  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250  610  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10 610 09 23 64 -31  0
+   -1 sprites/rapids.png  90 610 09 39 64 -31 -8
+   -1 sprites/rapids.png 170 610 09 23 64 -31  0
+   -1 sprites/rapids.png 250 610 09 39 64 -31 -8
   -1 * 7	 02 05 0C 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10  660  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90  660  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170  660  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250  660  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10 660 09 23 64 -31  0
+   -1 sprites/rapids.png  90 660 09 39 64 -31 -8
+   -1 sprites/rapids.png 170 660 09 23 64 -31  0
+   -1 sprites/rapids.png 250 660 09 39 64 -31 -8
   -1 * 7	 02 05 0D 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10  710  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90  710  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170  710  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250  710  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10 710 09 23 64 -31  0
+   -1 sprites/rapids.png  90 710 09 39 64 -31 -8
+   -1 sprites/rapids.png 170 710 09 23 64 -31  0
+   -1 sprites/rapids.png 250 710 09 39 64 -31 -8
   -1 * 7	 02 05 0E 01 00 00 00

   -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png 8bpp  10  760  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp  90  760  64  39 -31  -8 normal
-   -1 sprites/rapids.png 8bpp 170  760  64  23 -31   0 normal
-   -1 sprites/rapids.png 8bpp 250  760  64  39 -31  -8 normal
+   -1 sprites/rapids.png  10 760 09 23 64 -31  0
+   -1 sprites/rapids.png  90 760 09 39 64 -31 -8
+   -1 sprites/rapids.png 170 760 09 23 64 -31  0
+   -1 sprites/rapids.png 250 760 09 39 64 -31 -8
   -1 * 7	 02 05 0F 01 00 00 00

   -1 * 39	 02 05 10 80 00 01 10
--- a/media/extra_grf/rivers/temperate.nfo
+++ b/media/extra_grf/rivers/temperate.nfo
@@ -8,137 +8,137 @@
 //
   -1 * 0	 0C "Temperate river graphics by andythenorth (Andrew Parkhouse)"
   -1 * 4	 01 05 01 3C
-   -1 sprites/temperate.png 8bpp  10   10  38  19  -5   0 normal
-   -1 sprites/temperate.png 8bpp  58   10  38  18  -5  13 normal
-   -1 sprites/temperate.png 8bpp 106   10  38  18 -31  13 normal
-   -1 sprites/temperate.png 8bpp 154   10  38  19 -31   0 normal
-   -1 sprites/temperate.png 8bpp 202   10  19   9  14  11 normal
-   -1 sprites/temperate.png 8bpp 234   10  16   9  -7  22 normal
-   -1 sprites/temperate.png 8bpp 266   10  19   9 -31  11 normal
-   -1 sprites/temperate.png 8bpp 298   10  16   9  -7   0 normal
-   -1 sprites/temperate.png 8bpp 330   10   8   6  25  13 normal
-   -1 sprites/temperate.png 8bpp 346   10  12   4  -5  27 normal
-   -1 sprites/temperate.png 8bpp 364   10   8   6 -31  13 normal
-   -1 sprites/temperate.png 8bpp 380   10  12   5  -5   0 normal
+   -1 sprites/temperate.png  10  10 09 19 38  -5  0
+   -1 sprites/temperate.png  58  10 09 18 38  -5 13
+   -1 sprites/temperate.png 106  10 09 18 38 -31 13
+   -1 sprites/temperate.png 154  10 09 19 38 -31  0
+   -1 sprites/temperate.png 202  10 09  9 19  14 11
+   -1 sprites/temperate.png 234  10 09  9 16  -7 22
+   -1 sprites/temperate.png 266  10 09  9 19 -31 11
+   -1 sprites/temperate.png 298  10 09  9 16  -7  0
+   -1 sprites/temperate.png 330  10 09  6  8  25 13
+   -1 sprites/temperate.png 346  10 09  4 12  -5 27
+   -1 sprites/temperate.png 364  10 09  6  8 -31 13
+   -1 sprites/temperate.png 380  10 09  5 12  -5  0

-   -1 sprites/temperate.png 8bpp  10   40  40  11  -7   0 normal
-   -1 sprites/temperate.png 8bpp  58   40  39  18  -6   5 normal
-   -1 sprites/temperate.png 8bpp 106   40  38  11 -31  12 normal
-   -1 sprites/temperate.png 8bpp 154   40  39  18 -31   0 normal
-   -1 sprites/temperate.png 8bpp 202   40  20   6  13   5 normal
-   -1 sprites/temperate.png 8bpp 234   40  13   7  -6  16 normal
-   -1 sprites/temperate.png 8bpp 266   40  20   6 -31  12 normal
-   -1 sprites/temperate.png 8bpp 298   40  13   7  -5   0 normal
-   -1 sprites/temperate.png 8bpp 330   40   8   5  25   6 normal
-   -1 sprites/temperate.png 8bpp 346   40  12   3  -5  20 normal
-   -1 sprites/temperate.png 8bpp 364   40   8   4 -31  13 normal
-   -1 sprites/temperate.png 8bpp 380   40  15   4  -7   0 normal
+   -1 sprites/temperate.png  10  40 09 11 40  -7  0
+   -1 sprites/temperate.png  58  40 09 18 39  -6  5
+   -1 sprites/temperate.png 106  40 09 11 38 -31 12
+   -1 sprites/temperate.png 154  40 09 18 39 -31  0
+   -1 sprites/temperate.png 202  40 09  6 20  13  5
+   -1 sprites/temperate.png 234  40 09  7 13  -6 16
+   -1 sprites/temperate.png 266  40 09  6 20 -31 12
+   -1 sprites/temperate.png 298  40 09  7 13  -5  0
+   -1 sprites/temperate.png 330  40 09  5  8  25  6
+   -1 sprites/temperate.png 346  40 09  3 12  -5 20
+   -1 sprites/temperate.png 364  40 09  4  8 -31 13
+   -1 sprites/temperate.png 380  40 09  4 15  -7  0

-   -1 sprites/temperate.png 8bpp  10   70  38  20  -5  -8 normal
-   -1 sprites/temperate.png 8bpp  58   70  38  26  -5   5 normal
-   -1 sprites/temperate.png 8bpp 106   70  37  20 -31  11 normal
-   -1 sprites/temperate.png 8bpp 154   70  38  27 -31  -8 normal
-   -1 sprites/temperate.png 8bpp 202   70  16   9  17   3 normal
-   -1 sprites/temperate.png 8bpp 234   70  15   9  -7  22 normal
-   -1 sprites/temperate.png 8bpp 266   70  16   9 -31  11 normal
-   -1 sprites/temperate.png 8bpp 298   70  15   9  -6  -8 normal
-   -1 sprites/temperate.png 8bpp 330   70   8   7  25   5 normal
-   -1 sprites/temperate.png 8bpp 346   70  10   5  -4  27 normal
-   -1 sprites/temperate.png 8bpp 364   70   8   7 -31  11 normal
-   -1 sprites/temperate.png 8bpp 380   70  12   6  -5  -8 normal
+   -1 sprites/temperate.png  10  70 09 20 38  -5 -8
+   -1 sprites/temperate.png  58  70 09 26 38  -5  5
+   -1 sprites/temperate.png 106  70 09 20 37 -31 11
+   -1 sprites/temperate.png 154  70 09 27 38 -31 -8
+   -1 sprites/temperate.png 202  70 09  9 16  17  3
+   -1 sprites/temperate.png 234  70 09  9 15  -7 22
+   -1 sprites/temperate.png 266  70 09  9 16 -31 11
+   -1 sprites/temperate.png 298  70 09  9 15  -6 -8
+   -1 sprites/temperate.png 330  70 09  7  8  25  5
+   -1 sprites/temperate.png 346  70 09  5 10  -4 27
+   -1 sprites/temperate.png 364  70 09  7  8 -31 11
+   -1 sprites/temperate.png 380  70 09  6 12  -5 -8

-   -1 sprites/temperate.png 8bpp  10  100  39  18  -6   0 normal
-   -1 sprites/temperate.png 8bpp  58  100  38  11  -5  12 normal
-   -1 sprites/temperate.png 8bpp 106  100  39  18 -31   5 normal
-   -1 sprites/temperate.png 8bpp 154  100  40  11 -32   0 normal
-   -1 sprites/temperate.png 8bpp 202  100  20   6  13  12 normal
-   -1 sprites/temperate.png 8bpp 234  100  13   7  -5  16 normal
-   -1 sprites/temperate.png 8bpp 266  100  20   6 -31   5 normal
-   -1 sprites/temperate.png 8bpp 298  100  13   7  -6   0 normal
-   -1 sprites/temperate.png 8bpp 330  100   8   4  26  13 normal
-   -1 sprites/temperate.png 8bpp 346  100  12   3  -5  20 normal
-   -1 sprites/temperate.png 8bpp 364  100   8   5 -31   6 normal
-   -1 sprites/temperate.png 8bpp 380  100  15   4  -6   0 normal
+   -1 sprites/temperate.png  10 100 09 18 39  -6  0
+   -1 sprites/temperate.png  58 100 09 11 38  -5 12
+   -1 sprites/temperate.png 106 100 09 18 39 -31  5
+   -1 sprites/temperate.png 154 100 09 11 40 -32  0
+   -1 sprites/temperate.png 202 100 09  6 20  13 12
+   -1 sprites/temperate.png 234 100 09  7 13  -5 16
+   -1 sprites/temperate.png 266 100 09  6 20 -31  5
+   -1 sprites/temperate.png 298 100 09  7 13  -6  0
+   -1 sprites/temperate.png 330 100 09  4  8  26 13
+   -1 sprites/temperate.png 346 100 09  3 12  -5 20
+   -1 sprites/temperate.png 364 100 09  5  8 -31  6
+   -1 sprites/temperate.png 380 100 09  4 15  -6  0

-   -1 sprites/temperate.png 8bpp  10  130  38  27  -5  -8 normal
-   -1 sprites/temperate.png 8bpp  58  130  37  20  -4  11 normal
-   -1 sprites/temperate.png 8bpp 106  130  37  26 -31   5 normal
-   -1 sprites/temperate.png 8bpp 154  130  38  20 -31  -8 normal
-   -1 sprites/temperate.png 8bpp 202  130  16   9  17  11 normal
-   -1 sprites/temperate.png 8bpp 234  130  15   9  -6  22 normal
-   -1 sprites/temperate.png 8bpp 266  130  16   9 -31   3 normal
-   -1 sprites/temperate.png 8bpp 298  130  15   9  -7  -8 normal
-   -1 sprites/temperate.png 8bpp 330  130   8   7  25  11 normal
-   -1 sprites/temperate.png 8bpp 346  130  10   5  -4  26 normal
-   -1 sprites/temperate.png 8bpp 364  130   8   7 -31   5 normal
-   -1 sprites/temperate.png 8bpp 380  130  12   6  -5  -8 normal
+   -1 sprites/temperate.png  10 130 09 27 38  -5 -8
+   -1 sprites/temperate.png  58 130 09 20 37  -4 11
+   -1 sprites/temperate.png 106 130 09 26 37 -31  5
+   -1 sprites/temperate.png 154 130 09 20 38 -31 -8
+   -1 sprites/temperate.png 202 130 09  9 16  17 11
+   -1 sprites/temperate.png 234 130 09  9 15  -6 22
+   -1 sprites/temperate.png 266 130 09  9 16 -31  3
+   -1 sprites/temperate.png 298 130 09  9 15  -7 -8
+   -1 sprites/temperate.png 330 130 09  7  8  25 11
+   -1 sprites/temperate.png 346 130 09  5 10  -4 26
+   -1 sprites/temperate.png 364 130 09  7  8 -31  5
+   -1 sprites/temperate.png 380 130 09  6 12  -5 -8
   -1 * 7	 02 05 20 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/temperate.png 8bpp  10  210  38  19  -5   0 normal
-   -1 sprites/temperate.png 8bpp  58  210  38  18  -5  13 normal
-   -1 sprites/temperate.png 8bpp 106  210  38  18 -31  13 normal
-   -1 sprites/temperate.png 8bpp 154  210  38  19 -31   0 normal
-   -1 sprites/temperate.png 8bpp 202  210  19   9  14  11 normal
-   -1 sprites/temperate.png 8bpp 234  210  16   9  -7  22 normal
-   -1 sprites/temperate.png 8bpp 266  210  19   9 -31  11 normal
-   -1 sprites/temperate.png 8bpp 298  210  16   9  -7   0 normal
-   -1 sprites/temperate.png 8bpp 330  210   8   6  25  13 normal
-   -1 sprites/temperate.png 8bpp 346  210  12   4  -5  27 normal
-   -1 sprites/temperate.png 8bpp 364  210   8   6 -31  13 normal
-   -1 sprites/temperate.png 8bpp 380  210  12   5  -5   0 normal
+   -1 sprites/temperate.png  10 210 09 19 38  -5  0
+   -1 sprites/temperate.png  58 210 09 18 38  -5 13
+   -1 sprites/temperate.png 106 210 09 18 38 -31 13
+   -1 sprites/temperate.png 154 210 09 19 38 -31  0
+   -1 sprites/temperate.png 202 210 09  9 19  14 11
+   -1 sprites/temperate.png 234 210 09  9 16  -7 22
+   -1 sprites/temperate.png 266 210 09  9 19 -31 11
+   -1 sprites/temperate.png 298 210 09  9 16  -7  0
+   -1 sprites/temperate.png 330 210 09  6  8  25 13
+   -1 sprites/temperate.png 346 210 09  4 12  -5 27
+   -1 sprites/temperate.png 364 210 09  6  8 -31 13
+   -1 sprites/temperate.png 380 210 09  5 12  -5  0

-   -1 sprites/temperate.png 8bpp  10  240  40  11  -7   0 normal
-   -1 sprites/temperate.png 8bpp  58  240  39  18  -6   5 normal
-   -1 sprites/temperate.png 8bpp 106  240  38  11 -31  12 normal
-   -1 sprites/temperate.png 8bpp 154  240  39  18 -31   0 normal
-   -1 sprites/temperate.png 8bpp 202  240  20   6  13   5 normal
-   -1 sprites/temperate.png 8bpp 234  240  13   7  -6  16 normal
-   -1 sprites/temperate.png 8bpp 266  240  20   6 -31  12 normal
-   -1 sprites/temperate.png 8bpp 298  240  13   7  -5   0 normal
-   -1 sprites/temperate.png 8bpp 330  240   8   5  25   6 normal
-   -1 sprites/temperate.png 8bpp 346  240  12   3  -5  20 normal
-   -1 sprites/temperate.png 8bpp 364  240   8   4 -31  13 normal
-   -1 sprites/temperate.png 8bpp 380  240  15   4  -7   0 normal
+   -1 sprites/temperate.png  10 240 09 11 40  -7  0
+   -1 sprites/temperate.png  58 240 09 18 39  -6  5
+   -1 sprites/temperate.png 106 240 09 11 38 -31 12
+   -1 sprites/temperate.png 154 240 09 18 39 -31  0
+   -1 sprites/temperate.png 202 240 09  6 20  13  5
+   -1 sprites/temperate.png 234 240 09  7 13  -6 16
+   -1 sprites/temperate.png 266 240 09  6 20 -31 12
+   -1 sprites/temperate.png 298 240 09  7 13  -5  0
+   -1 sprites/temperate.png 330 240 09  5  8  25  6
+   -1 sprites/temperate.png 346 240 09  3 12  -5 20
+   -1 sprites/temperate.png 364 240 09  4  8 -31 13
+   -1 sprites/temperate.png 380 240 09  4 15  -7  0

-   -1 sprites/temperate.png 8bpp  10  270  38  20  -5  -8 normal
-   -1 sprites/temperate.png 8bpp  58  270  38  26  -5   5 normal
-   -1 sprites/temperate.png 8bpp 106  270  37  20 -31  11 normal
-   -1 sprites/temperate.png 8bpp 154  270  38  27 -31  -8 normal
-   -1 sprites/temperate.png 8bpp 202  270  16   9  17   3 normal
-   -1 sprites/temperate.png 8bpp 234  270  15   9  -7  22 normal
-   -1 sprites/temperate.png 8bpp 266  270  16   9 -31  11 normal
-   -1 sprites/temperate.png 8bpp 298  270  15   9  -6  -8 normal
-   -1 sprites/temperate.png 8bpp 330  270   8   7  25   5 normal
-   -1 sprites/temperate.png 8bpp 346  270  10   5  -4  27 normal
-   -1 sprites/temperate.png 8bpp 364  270   8   7 -31  11 normal
-   -1 sprites/temperate.png 8bpp 380  270  12   6  -5  -8 normal
+   -1 sprites/temperate.png  10 270 09 20 38  -5 -8
+   -1 sprites/temperate.png  58 270 09 26 38  -5  5
+   -1 sprites/temperate.png 106 270 09 20 37 -31 11
+   -1 sprites/temperate.png 154 270 09 27 38 -31 -8
+   -1 sprites/temperate.png 202 270 09  9 16  17  3
+   -1 sprites/temperate.png 234 270 09  9 15  -7 22
+   -1 sprites/temperate.png 266 270 09  9 16 -31 11
+   -1 sprites/temperate.png 298 270 09  9 15  -6 -8
+   -1 sprites/temperate.png 330 270 09  7  8  25  5
+   -1 sprites/temperate.png 346 270 09  5 10  -4 27
+   -1 sprites/temperate.png 364 270 09  7  8 -31 11
+   -1 sprites/temperate.png 380 270 09  6 12  -5 -8

-   -1 sprites/temperate.png 8bpp  10  300  39  18  -6   0 normal
-   -1 sprites/temperate.png 8bpp  58  300  38  11  -5  12 normal
-   -1 sprites/temperate.png 8bpp 106  300  39  18 -31   5 normal
-   -1 sprites/temperate.png 8bpp 154  300  40  11 -32   0 normal
-   -1 sprites/temperate.png 8bpp 202  300  20   6  13  12 normal
-   -1 sprites/temperate.png 8bpp 234  300  13   7  -5  16 normal
-   -1 sprites/temperate.png 8bpp 266  300  20   6 -31   5 normal
-   -1 sprites/temperate.png 8bpp 298  300  13   7  -6   0 normal
-   -1 sprites/temperate.png 8bpp 330  300   8   4  26  13 normal
-   -1 sprites/temperate.png 8bpp 346  300  12   3  -5  20 normal
-   -1 sprites/temperate.png 8bpp 364  300   8   5 -31   6 normal
-   -1 sprites/temperate.png 8bpp 380  300  15   4  -6   0 normal
+   -1 sprites/temperate.png  10 300 09 18 39  -6  0
+   -1 sprites/temperate.png  58 300 09 11 38  -5 12
+   -1 sprites/temperate.png 106 300 09 18 39 -31  5
+   -1 sprites/temperate.png 154 300 09 11 40 -32  0
+   -1 sprites/temperate.png 202 300 09  6 20  13 12
+   -1 sprites/temperate.png 234 300 09  7 13  -5 16
+   -1 sprites/temperate.png 266 300 09  6 20 -31  5
+   -1 sprites/temperate.png 298 300 09  7 13  -6  0
+   -1 sprites/temperate.png 330 300 09  4  8  26 13
+   -1 sprites/temperate.png 346 300 09  3 12  -5 20
+   -1 sprites/temperate.png 364 300 09  5  8 -31  6
+   -1 sprites/temperate.png 380 300 09  4 15  -6  0

-   -1 sprites/temperate.png 8bpp  10  330  38  27  -5  -8 normal
-   -1 sprites/temperate.png 8bpp  58  330  37  20  -4  11 normal
-   -1 sprites/temperate.png 8bpp 106  330  37  26 -31   5 normal
-   -1 sprites/temperate.png 8bpp 154  330  38  20 -31  -8 normal
-   -1 sprites/temperate.png 8bpp 202  330  16   9  17  11 normal
-   -1 sprites/temperate.png 8bpp 234  330  15   9  -6  22 normal
-   -1 sprites/temperate.png 8bpp 266  330  16   9 -31   3 normal
-   -1 sprites/temperate.png 8bpp 298  330  15   9  -7  -8 normal
-   -1 sprites/temperate.png 8bpp 330  330   8   7  25  11 normal
-   -1 sprites/temperate.png 8bpp 346  330  10   5  -4  26 normal
-   -1 sprites/temperate.png 8bpp 364  330   8   7 -31   5 normal
-   -1 sprites/temperate.png 8bpp 380  330  12   6  -5  -8 normal
+   -1 sprites/temperate.png  10 330 09 27 38  -5 -8
+   -1 sprites/temperate.png  58 330 09 20 37  -4 11
+   -1 sprites/temperate.png 106 330 09 26 37 -31  5
+   -1 sprites/temperate.png 154 330 09 20 38 -31 -8
+   -1 sprites/temperate.png 202 330 09  9 16  17 11
+   -1 sprites/temperate.png 234 330 09  9 15  -6 22
+   -1 sprites/temperate.png 266 330 09  9 16 -31  3
+   -1 sprites/temperate.png 298 330 09  9 15  -7 -8
+   -1 sprites/temperate.png 330 330 09  7  8  25 11
+   -1 sprites/temperate.png 346 330 09  5 10  -4 26
+   -1 sprites/temperate.png 364 330 09  7  8 -31  5
+   -1 sprites/temperate.png 380 330 09  6 12  -5 -8
   -1 * 7	 02 05 21 01 00 00 00

   -1 * 14	 02 05 22 81 80 00 FF 01 20 00 00 00 21 00
--- a/media/extra_grf/rivers/toyland.nfo
+++ b/media/extra_grf/rivers/toyland.nfo
@@ -8,137 +8,137 @@
 //
   -1 * 0	 0C "Toyland river graphics by andythenorth (Andrew Parkhouse)"
   -1 * 4	 01 05 01 3C
-   -1 sprites/toyland.png 8bpp  10   10  38  19  -5   0 normal
-   -1 sprites/toyland.png 8bpp  58   10  38  18  -5  13 normal
-   -1 sprites/toyland.png 8bpp 106   10  38  18 -31  13 normal
-   -1 sprites/toyland.png 8bpp 154   10  38  19 -31   0 normal
-   -1 sprites/toyland.png 8bpp 202   10  19   9  14  11 normal
-   -1 sprites/toyland.png 8bpp 234   10  16   9  -7  22 normal
-   -1 sprites/toyland.png 8bpp 266   10  19   9 -31  11 normal
-   -1 sprites/toyland.png 8bpp 298   10  16   9  -7   0 normal
-   -1 sprites/toyland.png 8bpp 330   10   8   6  25  13 normal
-   -1 sprites/toyland.png 8bpp 346   10  12   4  -5  27 normal
-   -1 sprites/toyland.png 8bpp 364   10   8   6 -31  13 normal
-   -1 sprites/toyland.png 8bpp 380   10  12   5  -5   0 normal
+   -1 sprites/toyland.png  10  10 09 19 38  -5  0
+   -1 sprites/toyland.png  58  10 09 18 38  -5 13
+   -1 sprites/toyland.png 106  10 09 18 38 -31 13
+   -1 sprites/toyland.png 154  10 09 19 38 -31  0
+   -1 sprites/toyland.png 202  10 09  9 19  14 11
+   -1 sprites/toyland.png 234  10 09  9 16  -7 22
+   -1 sprites/toyland.png 266  10 09  9 19 -31 11
+   -1 sprites/toyland.png 298  10 09  9 16  -7  0
+   -1 sprites/toyland.png 330  10 09  6  8  25 13
+   -1 sprites/toyland.png 346  10 09  4 12  -5 27
+   -1 sprites/toyland.png 364  10 09  6  8 -31 13
+   -1 sprites/toyland.png 380  10 09  5 12  -5  0

-   -1 sprites/toyland.png 8bpp  10   40  40  11  -7   0 normal
-   -1 sprites/toyland.png 8bpp  58   40  39  18  -6   5 normal
-   -1 sprites/toyland.png 8bpp 106   40  38  11 -31  12 normal
-   -1 sprites/toyland.png 8bpp 154   40  39  18 -31   0 normal
-   -1 sprites/toyland.png 8bpp 202   40  20   6  13   5 normal
-   -1 sprites/toyland.png 8bpp 234   40  13   7  -6  16 normal
-   -1 sprites/toyland.png 8bpp 266   40  20   6 -31  12 normal
-   -1 sprites/toyland.png 8bpp 298   40  13   7  -5   0 normal
-   -1 sprites/toyland.png 8bpp 330   40   8   5  25   6 normal
-   -1 sprites/toyland.png 8bpp 346   40  12   3  -5  20 normal
-   -1 sprites/toyland.png 8bpp 364   40   8   4 -31  13 normal
-   -1 sprites/toyland.png 8bpp 380   40  15   4  -7   0 normal
+   -1 sprites/toyland.png  10  40 09 11 40  -7  0
+   -1 sprites/toyland.png  58  40 09 18 39  -6  5
+   -1 sprites/toyland.png 106  40 09 11 38 -31 12
+   -1 sprites/toyland.png 154  40 09 18 39 -31  0
+   -1 sprites/toyland.png 202  40 09  6 20  13  5
+   -1 sprites/toyland.png 234  40 09  7 13  -6 16
+   -1 sprites/toyland.png 266  40 09  6 20 -31 12
+   -1 sprites/toyland.png 298  40 09  7 13  -5  0
+   -1 sprites/toyland.png 330  40 09  5  8  25  6
+   -1 sprites/toyland.png 346  40 09  3 12  -5 20
+   -1 sprites/toyland.png 364  40 09  4  8 -31 13
+   -1 sprites/toyland.png 380  40 09  4 15  -7  0

-   -1 sprites/toyland.png 8bpp  10   70  38  20  -5  -8 normal
-   -1 sprites/toyland.png 8bpp  58   70  38  26  -5   5 normal
-   -1 sprites/toyland.png 8bpp 106   70  37  20 -31  11 normal
-   -1 sprites/toyland.png 8bpp 154   70  38  27 -31  -8 normal
-   -1 sprites/toyland.png 8bpp 202   70  16   9  17   3 normal
-   -1 sprites/toyland.png 8bpp 234   70  15   9  -7  22 normal
-   -1 sprites/toyland.png 8bpp 266   70  16   9 -31  11 normal
-   -1 sprites/toyland.png 8bpp 298   70  15   9  -6  -8 normal
-   -1 sprites/toyland.png 8bpp 330   70   8   7  25   5 normal
-   -1 sprites/toyland.png 8bpp 346   70  10   5  -4  27 normal
-   -1 sprites/toyland.png 8bpp 364   70   8   7 -31  11 normal
-   -1 sprites/toyland.png 8bpp 380   70  12   6  -5  -8 normal
+   -1 sprites/toyland.png  10  70 09 20 38  -5 -8
+   -1 sprites/toyland.png  58  70 09 26 38  -5  5
+   -1 sprites/toyland.png 106  70 09 20 37 -31 11
+   -1 sprites/toyland.png 154  70 09 27 38 -31 -8
+   -1 sprites/toyland.png 202  70 09  9 16  17  3
+   -1 sprites/toyland.png 234  70 09  9 15  -7 22
+   -1 sprites/toyland.png 266  70 09  9 16 -31 11
+   -1 sprites/toyland.png 298  70 09  9 15  -6 -8
+   -1 sprites/toyland.png 330  70 09  7  8  25  5
+   -1 sprites/toyland.png 346  70 09  5 10  -4 27
+   -1 sprites/toyland.png 364  70 09  7  8 -31 11
+   -1 sprites/toyland.png 380  70 09  6 12  -5 -8

-   -1 sprites/toyland.png 8bpp  10  100  39  18  -6   0 normal
-   -1 sprites/toyland.png 8bpp  58  100  38  11  -5  12 normal
-   -1 sprites/toyland.png 8bpp 106  100  39  18 -31   5 normal
-   -1 sprites/toyland.png 8bpp 154  100  40  11 -32   0 normal
-   -1 sprites/toyland.png 8bpp 202  100  20   6  13  12 normal
-   -1 sprites/toyland.png 8bpp 234  100  13   7  -5  16 normal
-   -1 sprites/toyland.png 8bpp 266  100  20   6 -31   5 normal
-   -1 sprites/toyland.png 8bpp 298  100  13   7  -6   0 normal
-   -1 sprites/toyland.png 8bpp 330  100   8   4  26  13 normal
-   -1 sprites/toyland.png 8bpp 346  100  12   3  -5  20 normal
-   -1 sprites/toyland.png 8bpp 364  100   8   5 -31   6 normal
-   -1 sprites/toyland.png 8bpp 380  100  15   4  -6   0 normal
+   -1 sprites/toyland.png  10 100 09 18 39  -6  0
+   -1 sprites/toyland.png  58 100 09 11 38  -5 12
+   -1 sprites/toyland.png 106 100 09 18 39 -31  5
+   -1 sprites/toyland.png 154 100 09 11 40 -32  0
+   -1 sprites/toyland.png 202 100 09  6 20  13 12
+   -1 sprites/toyland.png 234 100 09  7 13  -5 16
+   -1 sprites/toyland.png 266 100 09  6 20 -31  5
+   -1 sprites/toyland.png 298 100 09  7 13  -6  0
+   -1 sprites/toyland.png 330 100 09  4  8  26 13
+   -1 sprites/toyland.png 346 100 09  3 12  -5 20
+   -1 sprites/toyland.png 364 100 09  5  8 -31  6
+   -1 sprites/toyland.png 380 100 09  4 15  -6  0

-   -1 sprites/toyland.png 8bpp  10  130  38  27  -5  -8 normal
-   -1 sprites/toyland.png 8bpp  58  130  37  20  -4  11 normal
-   -1 sprites/toyland.png 8bpp 106  130  37  26 -31   5 normal
-   -1 sprites/toyland.png 8bpp 154  130  38  20 -31  -8 normal
-   -1 sprites/toyland.png 8bpp 202  130  16   9  17  11 normal
-   -1 sprites/toyland.png 8bpp 234  130  15   9  -6  22 normal
-   -1 sprites/toyland.png 8bpp 266  130  16   9 -31   3 normal
-   -1 sprites/toyland.png 8bpp 298  130  15   9  -7  -8 normal
-   -1 sprites/toyland.png 8bpp 330  130   8   7  25  11 normal
-   -1 sprites/toyland.png 8bpp 346  130  10   5  -4  26 normal
-   -1 sprites/toyland.png 8bpp 364  130   8   7 -31   5 normal
-   -1 sprites/toyland.png 8bpp 380  130  12   6  -5  -8 normal
+   -1 sprites/toyland.png  10 130 09 27 38  -5 -8
+   -1 sprites/toyland.png  58 130 09 20 37  -4 11
+   -1 sprites/toyland.png 106 130 09 26 37 -31  5
+   -1 sprites/toyland.png 154 130 09 20 38 -31 -8
+   -1 sprites/toyland.png 202 130 09  9 16  17 11
+   -1 sprites/toyland.png 234 130 09  9 15  -6 22
+   -1 sprites/toyland.png 266 130 09  9 16 -31  3
+   -1 sprites/toyland.png 298 130 09  9 15  -7 -8
+   -1 sprites/toyland.png 330 130 09  7  8  25 11
+   -1 sprites/toyland.png 346 130 09  5 10  -4 26
+   -1 sprites/toyland.png 364 130 09  7  8 -31  5
+   -1 sprites/toyland.png 380 130 09  6 12  -5 -8
   -1 * 7	 02 05 50 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/toyland.png 8bpp  10  210  38  19  -5   0 normal
-   -1 sprites/toyland.png 8bpp  58  210  38  18  -5  13 normal
-   -1 sprites/toyland.png 8bpp 106  210  38  18 -31  13 normal
-   -1 sprites/toyland.png 8bpp 154  210  38  19 -31   0 normal
-   -1 sprites/toyland.png 8bpp 202  210  19   9  14  11 normal
-   -1 sprites/toyland.png 8bpp 234  210  16   9  -7  22 normal
-   -1 sprites/toyland.png 8bpp 266  210  19   9 -31  11 normal
-   -1 sprites/toyland.png 8bpp 298  210  16   9  -7   0 normal
-   -1 sprites/toyland.png 8bpp 330  210   8   6  25  13 normal
-   -1 sprites/toyland.png 8bpp 346  210  12   4  -5  27 normal
-   -1 sprites/toyland.png 8bpp 364  210   8   6 -31  13 normal
-   -1 sprites/toyland.png 8bpp 380  210  12   5  -5   0 normal
+   -1 sprites/toyland.png  10 210 09 19 38  -5  0
+   -1 sprites/toyland.png  58 210 09 18 38  -5 13
+   -1 sprites/toyland.png 106 210 09 18 38 -31 13
+   -1 sprites/toyland.png 154 210 09 19 38 -31  0
+   -1 sprites/toyland.png 202 210 09  9 19  14 11
+   -1 sprites/toyland.png 234 210 09  9 16  -7 22
+   -1 sprites/toyland.png 266 210 09  9 19 -31 11
+   -1 sprites/toyland.png 298 210 09  9 16  -7  0
+   -1 sprites/toyland.png 330 210 09  6  8  25 13
+   -1 sprites/toyland.png 346 210 09  4 12  -5 27
+   -1 sprites/toyland.png 364 210 09  6  8 -31 13
+   -1 sprites/toyland.png 380 210 09  5 12  -5  0

-   -1 sprites/toyland.png 8bpp  10  240  40  11  -7   0 normal
-   -1 sprites/toyland.png 8bpp  58  240  39  18  -6   5 normal
-   -1 sprites/toyland.png 8bpp 106  240  38  11 -31  12 normal
-   -1 sprites/toyland.png 8bpp 154  240  39  18 -31   0 normal
-   -1 sprites/toyland.png 8bpp 202  240  20   6  13   5 normal
-   -1 sprites/toyland.png 8bpp 234  240  13   7  -6  16 normal
-   -1 sprites/toyland.png 8bpp 266  240  20   6 -31  12 normal
-   -1 sprites/toyland.png 8bpp 298  240  13   7  -5   0 normal
-   -1 sprites/toyland.png 8bpp 330  240   8   5  25   6 normal
-   -1 sprites/toyland.png 8bpp 346  240  12   3  -5  20 normal
-   -1 sprites/toyland.png 8bpp 364  240   8   4 -31  13 normal
-   -1 sprites/toyland.png 8bpp 380  240  15   4  -7   0 normal
+   -1 sprites/toyland.png  10 240 09 11 40  -7  0
+   -1 sprites/toyland.png  58 240 09 18 39  -6  5
+   -1 sprites/toyland.png 106 240 09 11 38 -31 12
+   -1 sprites/toyland.png 154 240 09 18 39 -31  0
+   -1 sprites/toyland.png 202 240 09  6 20  13  5
+   -1 sprites/toyland.png 234 240 09  7 13  -6 16
+   -1 sprites/toyland.png 266 240 09  6 20 -31 12
+   -1 sprites/toyland.png 298 240 09  7 13  -5  0
+   -1 sprites/toyland.png 330 240 09  5  8  25  6
+   -1 sprites/toyland.png 346 240 09  3 12  -5 20
+   -1 sprites/toyland.png 364 240 09  4  8 -31 13
+   -1 sprites/toyland.png 380 240 09  4 15  -7  0

-   -1 sprites/toyland.png 8bpp  10  270  38  20  -5  -8 normal
-   -1 sprites/toyland.png 8bpp  58  270  38  26  -5   5 normal
-   -1 sprites/toyland.png 8bpp 106  270  37  20 -31  11 normal
-   -1 sprites/toyland.png 8bpp 154  270  38  27 -31  -8 normal
-   -1 sprites/toyland.png 8bpp 202  270  16   9  17   3 normal
-   -1 sprites/toyland.png 8bpp 234  270  15   9  -7  22 normal
-   -1 sprites/toyland.png 8bpp 266  270  16   9 -31  11 normal
-   -1 sprites/toyland.png 8bpp 298  270  15   9  -6  -8 normal
-   -1 sprites/toyland.png 8bpp 330  270   8   7  25   5 normal
-   -1 sprites/toyland.png 8bpp 346  270  10   5  -4  27 normal
-   -1 sprites/toyland.png 8bpp 364  270   8   7 -31  11 normal
-   -1 sprites/toyland.png 8bpp 380  270  12   6  -5  -8 normal
+   -1 sprites/toyland.png  10 270 09 20 38  -5 -8
+   -1 sprites/toyland.png  58 270 09 26 38  -5  5
+   -1 sprites/toyland.png 106 270 09 20 37 -31 11
+   -1 sprites/toyland.png 154 270 09 27 38 -31 -8
+   -1 sprites/toyland.png 202 270 09  9 16  17  3
+   -1 sprites/toyland.png 234 270 09  9 15  -7 22
+   -1 sprites/toyland.png 266 270 09  9 16 -31 11
+   -1 sprites/toyland.png 298 270 09  9 15  -6 -8
+   -1 sprites/toyland.png 330 270 09  7  8  25  5
+   -1 sprites/toyland.png 346 270 09  5 10  -4 27
+   -1 sprites/toyland.png 364 270 09  7  8 -31 11
+   -1 sprites/toyland.png 380 270 09  6 12  -5 -8

-   -1 sprites/toyland.png 8bpp  10  300  39  18  -6   0 normal
-   -1 sprites/toyland.png 8bpp  58  300  38  11  -5  12 normal
-   -1 sprites/toyland.png 8bpp 106  300  39  18 -31   5 normal
-   -1 sprites/toyland.png 8bpp 154  300  40  11 -32   0 normal
-   -1 sprites/toyland.png 8bpp 202  300  20   6  13  12 normal
-   -1 sprites/toyland.png 8bpp 234  300  13   7  -5  16 normal
-   -1 sprites/toyland.png 8bpp 266  300  20   6 -31   5 normal
-   -1 sprites/toyland.png 8bpp 298  300  13   7  -6   0 normal
-   -1 sprites/toyland.png 8bpp 330  300   8   4  26  13 normal
-   -1 sprites/toyland.png 8bpp 346  300  12   3  -5  20 normal
-   -1 sprites/toyland.png 8bpp 364  300   8   5 -31   6 normal
-   -1 sprites/toyland.png 8bpp 380  300  15   4  -6   0 normal
+   -1 sprites/toyland.png  10 300 09 18 39  -6  0
+   -1 sprites/toyland.png  58 300 09 11 38  -5 12
+   -1 sprites/toyland.png 106 300 09 18 39 -31  5
+   -1 sprites/toyland.png 154 300 09 11 40 -32  0
+   -1 sprites/toyland.png 202 300 09  6 20  13 12
+   -1 sprites/toyland.png 234 300 09  7 13  -5 16
+   -1 sprites/toyland.png 266 300 09  6 20 -31  5
+   -1 sprites/toyland.png 298 300 09  7 13  -6  0
+   -1 sprites/toyland.png 330 300 09  4  8  26 13
+   -1 sprites/toyland.png 346 300 09  3 12  -5 20
+   -1 sprites/toyland.png 364 300 09  5  8 -31  6
+   -1 sprites/toyland.png 380 300 09  4 15  -6  0

-   -1 sprites/toyland.png 8bpp  10  330  38  27  -5  -8 normal
-   -1 sprites/toyland.png 8bpp  58  330  37  20  -4  11 normal
-   -1 sprites/toyland.png 8bpp 106  330  37  26 -31   5 normal
-   -1 sprites/toyland.png 8bpp 154  330  38  20 -31  -8 normal
-   -1 sprites/toyland.png 8bpp 202  330  16   9  17  11 normal
-   -1 sprites/toyland.png 8bpp 234  330  15   9  -6  22 normal
-   -1 sprites/toyland.png 8bpp 266  330  16   9 -31   3 normal
-   -1 sprites/toyland.png 8bpp 298  330  15   9  -7  -8 normal
-   -1 sprites/toyland.png 8bpp 330  330   8   7  25  11 normal
-   -1 sprites/toyland.png 8bpp 346  330  10   5  -4  26 normal
-   -1 sprites/toyland.png 8bpp 364  330   8   7 -31   5 normal
-   -1 sprites/toyland.png 8bpp 380  330  12   6  -5  -8 normal
+   -1 sprites/toyland.png  10 330 09 27 38  -5 -8
+   -1 sprites/toyland.png  58 330 09 20 37  -4 11
+   -1 sprites/toyland.png 106 330 09 26 37 -31  5
+   -1 sprites/toyland.png 154 330 09 20 38 -31 -8
+   -1 sprites/toyland.png 202 330 09  9 16  17 11
+   -1 sprites/toyland.png 234 330 09  9 15  -6 22
+   -1 sprites/toyland.png 266 330 09  9 16 -31  3
+   -1 sprites/toyland.png 298 330 09  9 15  -7 -8
+   -1 sprites/toyland.png 330 330 09  7  8  25 11
+   -1 sprites/toyland.png 346 330 09  5 10  -4 26
+   -1 sprites/toyland.png 364 330 09  7  8 -31  5
+   -1 sprites/toyland.png 380 330 09  6 12  -5 -8
   -1 * 7	 02 05 51 01 00 00 00

   -1 * 14	 02 05 52 81 80 00 FF 01 50 00 00 00 51 00
--- a/media/extra_grf/rivers/tropic.nfo
+++ b/media/extra_grf/rivers/tropic.nfo
@@ -8,271 +8,271 @@
 //
   -1 * 0	 0C "Tropic river graphics by andythenorth (Andrew Parkhouse)"
   -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_desert.png 8bpp  10   10  38  19  -5   0 normal
-   -1 sprites/tropic_desert.png 8bpp  58   10  38  18  -5  13 normal
-   -1 sprites/tropic_desert.png 8bpp 106   10  38  18 -31  13 normal
-   -1 sprites/tropic_desert.png 8bpp 154   10  38  19 -31   0 normal
-   -1 sprites/tropic_desert.png 8bpp 202   10  19   9  14  11 normal
-   -1 sprites/tropic_desert.png 8bpp 234   10  16   9  -7  22 normal
-   -1 sprites/tropic_desert.png 8bpp 266   10  19   9 -31  11 normal
-   -1 sprites/tropic_desert.png 8bpp 298   10  16   9  -7   0 normal
-   -1 sprites/tropic_desert.png 8bpp 330   10   8   6  25  13 normal
-   -1 sprites/tropic_desert.png 8bpp 346   10  12   4  -5  27 normal
-   -1 sprites/tropic_desert.png 8bpp 364   10   8   6 -31  13 normal
-   -1 sprites/tropic_desert.png 8bpp 380   10  12   5  -5   0 normal
+   -1 sprites/tropic_desert.png  10  10 09 19 38  -5  0
+   -1 sprites/tropic_desert.png  58  10 09 18 38  -5 13
+   -1 sprites/tropic_desert.png 106  10 09 18 38 -31 13
+   -1 sprites/tropic_desert.png 154  10 09 19 38 -31  0
+   -1 sprites/tropic_desert.png 202  10 09  9 19  14 11
+   -1 sprites/tropic_desert.png 234  10 09  9 16  -7 22
+   -1 sprites/tropic_desert.png 266  10 09  9 19 -31 11
+   -1 sprites/tropic_desert.png 298  10 09  9 16  -7  0
+   -1 sprites/tropic_desert.png 330  10 09  6  8  25 13
+   -1 sprites/tropic_desert.png 346  10 09  4 12  -5 27
+   -1 sprites/tropic_desert.png 364  10 09  6  8 -31 13
+   -1 sprites/tropic_desert.png 380  10 09  5 12  -5  0

-   -1 sprites/tropic_desert.png 8bpp  10   40  40  11  -7   0 normal
-   -1 sprites/tropic_desert.png 8bpp  58   40  39  18  -6   5 normal
-   -1 sprites/tropic_desert.png 8bpp 106   40  38  11 -31  12 normal
-   -1 sprites/tropic_desert.png 8bpp 154   40  39  18 -31   0 normal
-   -1 sprites/tropic_desert.png 8bpp 202   40  20   6  13   5 normal
-   -1 sprites/tropic_desert.png 8bpp 234   40  13   7  -6  16 normal
-   -1 sprites/tropic_desert.png 8bpp 266   40  20   6 -31  12 normal
-   -1 sprites/tropic_desert.png 8bpp 298   40  13   7  -5   0 normal
-   -1 sprites/tropic_desert.png 8bpp 330   40   8   5  25   6 normal
-   -1 sprites/tropic_desert.png 8bpp 346   40  12   3  -5  20 normal
-   -1 sprites/tropic_desert.png 8bpp 364   40   8   4 -31  13 normal
-   -1 sprites/tropic_desert.png 8bpp 380   40  15   4  -7   0 normal
+   -1 sprites/tropic_desert.png  10  40 09 11 40  -7  0
+   -1 sprites/tropic_desert.png  58  40 09 18 39  -6  5
+   -1 sprites/tropic_desert.png 106  40 09 11 38 -31 12
+   -1 sprites/tropic_desert.png 154  40 09 18 39 -31  0
+   -1 sprites/tropic_desert.png 202  40 09  6 20  13  5
+   -1 sprites/tropic_desert.png 234  40 09  7 13  -6 16
+   -1 sprites/tropic_desert.png 266  40 09  6 20 -31 12
+   -1 sprites/tropic_desert.png 298  40 09  7 13  -5  0
+   -1 sprites/tropic_desert.png 330  40 09  5  8  25  6
+   -1 sprites/tropic_desert.png 346  40 09  3 12  -5 20
+   -1 sprites/tropic_desert.png 364  40 09  4  8 -31 13
+   -1 sprites/tropic_desert.png 380  40 09  4 15  -7  0

-   -1 sprites/tropic_desert.png 8bpp  10   70  38  20  -5  -8 normal
-   -1 sprites/tropic_desert.png 8bpp  58   70  38  26  -5   5 normal
-   -1 sprites/tropic_desert.png 8bpp 106   70  37  20 -31  11 normal
-   -1 sprites/tropic_desert.png 8bpp 154   70  38  27 -31  -8 normal
-   -1 sprites/tropic_desert.png 8bpp 202   70  16   9  17   3 normal
-   -1 sprites/tropic_desert.png 8bpp 234   70  15   9  -7  22 normal
-   -1 sprites/tropic_desert.png 8bpp 266   70  16   9 -31  11 normal
-   -1 sprites/tropic_desert.png 8bpp 298   70  15   9  -6  -8 normal
-   -1 sprites/tropic_desert.png 8bpp 330   70   8   7  25   5 normal
-   -1 sprites/tropic_desert.png 8bpp 346   70  10   5  -4  27 normal
-   -1 sprites/tropic_desert.png 8bpp 364   70   8   7 -31  11 normal
-   -1 sprites/tropic_desert.png 8bpp 380   70  12   6  -5  -8 normal
+   -1 sprites/tropic_desert.png  10  70 09 20 38  -5 -8
+   -1 sprites/tropic_desert.png  58  70 09 26 38  -5  5
+   -1 sprites/tropic_desert.png 106  70 09 20 37 -31 11
+   -1 sprites/tropic_desert.png 154  70 09 27 38 -31 -8
+   -1 sprites/tropic_desert.png 202  70 09  9 16  17  3
+   -1 sprites/tropic_desert.png 234  70 09  9 15  -7 22
+   -1 sprites/tropic_desert.png 266  70 09  9 16 -31 11
+   -1 sprites/tropic_desert.png 298  70 09  9 15  -6 -8
+   -1 sprites/tropic_desert.png 330  70 09  7  8  25  5
+   -1 sprites/tropic_desert.png 346  70 09  5 10  -4 27
+   -1 sprites/tropic_desert.png 364  70 09  7  8 -31 11
+   -1 sprites/tropic_desert.png 380  70 09  6 12  -5 -8

-   -1 sprites/tropic_desert.png 8bpp  10  100  39  18  -6   0 normal
-   -1 sprites/tropic_desert.png 8bpp  58  100  38  11  -5  12 normal
-   -1 sprites/tropic_desert.png 8bpp 106  100  39  18 -31   5 normal
-   -1 sprites/tropic_desert.png 8bpp 154  100  40  11 -32   0 normal
-   -1 sprites/tropic_desert.png 8bpp 202  100  20   6  13  12 normal
-   -1 sprites/tropic_desert.png 8bpp 234  100  13   7  -5  16 normal
-   -1 sprites/tropic_desert.png 8bpp 266  100  20   6 -31   5 normal
-   -1 sprites/tropic_desert.png 8bpp 298  100  13   7  -6   0 normal
-   -1 sprites/tropic_desert.png 8bpp 330  100   8   4  26  13 normal
-   -1 sprites/tropic_desert.png 8bpp 346  100  12   3  -5  20 normal
-   -1 sprites/tropic_desert.png 8bpp 364  100   8   5 -31   6 normal
-   -1 sprites/tropic_desert.png 8bpp 380  100  15   4  -6   0 normal
+   -1 sprites/tropic_desert.png  10 100 09 18 39  -6  0
+   -1 sprites/tropic_desert.png  58 100 09 11 38  -5 12
+   -1 sprites/tropic_desert.png 106 100 09 18 39 -31  5
+   -1 sprites/tropic_desert.png 154 100 09 11 40 -32  0
+   -1 sprites/tropic_desert.png 202 100 09  6 20  13 12
+   -1 sprites/tropic_desert.png 234 100 09  7 13  -5 16
+   -1 sprites/tropic_desert.png 266 100 09  6 20 -31  5
+   -1 sprites/tropic_desert.png 298 100 09  7 13  -6  0
+   -1 sprites/tropic_desert.png 330 100 09  4  8  26 13
+   -1 sprites/tropic_desert.png 346 100 09  3 12  -5 20
+   -1 sprites/tropic_desert.png 364 100 09  5  8 -31  6
+   -1 sprites/tropic_desert.png 380 100 09  4 15  -6  0

-   -1 sprites/tropic_desert.png 8bpp  10  130  38  27  -5  -8 normal
-   -1 sprites/tropic_desert.png 8bpp  58  130  37  20  -4  11 normal
-   -1 sprites/tropic_desert.png 8bpp 106  130  37  26 -31   5 normal
-   -1 sprites/tropic_desert.png 8bpp 154  130  38  20 -31  -8 normal
-   -1 sprites/tropic_desert.png 8bpp 202  130  16   9  17  11 normal
-   -1 sprites/tropic_desert.png 8bpp 234  130  15   9  -6  22 normal
-   -1 sprites/tropic_desert.png 8bpp 266  130  16   9 -31   3 normal
-   -1 sprites/tropic_desert.png 8bpp 298  130  15   9  -7  -8 normal
-   -1 sprites/tropic_desert.png 8bpp 330  130   8   7  25  11 normal
-   -1 sprites/tropic_desert.png 8bpp 346  130  10   5  -4  26 normal
-   -1 sprites/tropic_desert.png 8bpp 364  130   8   7 -31   5 normal
-   -1 sprites/tropic_desert.png 8bpp 380  130  12   6  -5  -8 normal
+   -1 sprites/tropic_desert.png  10 130 09 27 38  -5 -8
+   -1 sprites/tropic_desert.png  58 130 09 20 37  -4 11
+   -1 sprites/tropic_desert.png 106 130 09 26 37 -31  5
+   -1 sprites/tropic_desert.png 154 130 09 20 38 -31 -8
+   -1 sprites/tropic_desert.png 202 130 09  9 16  17 11
+   -1 sprites/tropic_desert.png 234 130 09  9 15  -6 22
+   -1 sprites/tropic_desert.png 266 130 09  9 16 -31  3
+   -1 sprites/tropic_desert.png 298 130 09  9 15  -7 -8
+   -1 sprites/tropic_desert.png 330 130 09  7  8  25 11
+   -1 sprites/tropic_desert.png 346 130 09  5 10  -4 26
+   -1 sprites/tropic_desert.png 364 130 09  7  8 -31  5
+   -1 sprites/tropic_desert.png 380 130 09  6 12  -5 -8
   -1 * 7	 02 05 40 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_forest.png 8bpp  10   10  38  19  -5   0 normal
-   -1 sprites/tropic_forest.png 8bpp  58   10  38  18  -5  13 normal
-   -1 sprites/tropic_forest.png 8bpp 106   10  38  18 -31  13 normal
-   -1 sprites/tropic_forest.png 8bpp 154   10  38  19 -31   0 normal
-   -1 sprites/tropic_forest.png 8bpp 202   10  19   9  14  11 normal
-   -1 sprites/tropic_forest.png 8bpp 234   10  16   9  -7  22 normal
-   -1 sprites/tropic_forest.png 8bpp 266   10  19   9 -31  11 normal
-   -1 sprites/tropic_forest.png 8bpp 298   10  16   9  -7   0 normal
-   -1 sprites/tropic_forest.png 8bpp 330   10   8   6  25  13 normal
-   -1 sprites/tropic_forest.png 8bpp 346   10  12   4  -5  27 normal
-   -1 sprites/tropic_forest.png 8bpp 364   10   8   6 -31  13 normal
-   -1 sprites/tropic_forest.png 8bpp 380   10  12   5  -5   0 normal
+   -1 sprites/tropic_forest.png  10  10 09 19 38  -5  0
+   -1 sprites/tropic_forest.png  58  10 09 18 38  -5 13
+   -1 sprites/tropic_forest.png 106  10 09 18 38 -31 13
+   -1 sprites/tropic_forest.png 154  10 09 19 38 -31  0
+   -1 sprites/tropic_forest.png 202  10 09  9 19  14 11
+   -1 sprites/tropic_forest.png 234  10 09  9 16  -7 22
+   -1 sprites/tropic_forest.png 266  10 09  9 19 -31 11
+   -1 sprites/tropic_forest.png 298  10 09  9 16  -7  0
+   -1 sprites/tropic_forest.png 330  10 09  6  8  25 13
+   -1 sprites/tropic_forest.png 346  10 09  4 12  -5 27
+   -1 sprites/tropic_forest.png 364  10 09  6  8 -31 13
+   -1 sprites/tropic_forest.png 380  10 09  5 12  -5  0

-   -1 sprites/tropic_forest.png 8bpp  10   40  40  11  -7   0 normal
-   -1 sprites/tropic_forest.png 8bpp  58   40  39  18  -6   5 normal
-   -1 sprites/tropic_forest.png 8bpp 106   40  38  11 -31  12 normal
-   -1 sprites/tropic_forest.png 8bpp 154   40  39  18 -31   0 normal
-   -1 sprites/tropic_forest.png 8bpp 202   40  20   6  13   5 normal
-   -1 sprites/tropic_forest.png 8bpp 234   40  13   7  -6  16 normal
-   -1 sprites/tropic_forest.png 8bpp 266   40  20   6 -31  12 normal
-   -1 sprites/tropic_forest.png 8bpp 298   40  13   7  -5   0 normal
-   -1 sprites/tropic_forest.png 8bpp 330   40   8   5  25   6 normal
-   -1 sprites/tropic_forest.png 8bpp 346   40  12   3  -5  20 normal
-   -1 sprites/tropic_forest.png 8bpp 364   40   8   4 -31  13 normal
-   -1 sprites/tropic_forest.png 8bpp 380   40  15   4  -7   0 normal
+   -1 sprites/tropic_forest.png  10  40 09 11 40  -7  0
+   -1 sprites/tropic_forest.png  58  40 09 18 39  -6  5
+   -1 sprites/tropic_forest.png 106  40 09 11 38 -31 12
+   -1 sprites/tropic_forest.png 154  40 09 18 39 -31  0
+   -1 sprites/tropic_forest.png 202  40 09  6 20  13  5
+   -1 sprites/tropic_forest.png 234  40 09  7 13  -6 16
+   -1 sprites/tropic_forest.png 266  40 09  6 20 -31 12
+   -1 sprites/tropic_forest.png 298  40 09  7 13  -5  0
+   -1 sprites/tropic_forest.png 330  40 09  5  8  25  6
+   -1 sprites/tropic_forest.png 346  40 09  3 12  -5 20
+   -1 sprites/tropic_forest.png 364  40 09  4  8 -31 13
+   -1 sprites/tropic_forest.png 380  40 09  4 15  -7  0

-   -1 sprites/tropic_forest.png 8bpp  10   70  38  20  -5  -8 normal
-   -1 sprites/tropic_forest.png 8bpp  58   70  38  26  -5   5 normal
-   -1 sprites/tropic_forest.png 8bpp 106   70  37  20 -31  11 normal
-   -1 sprites/tropic_forest.png 8bpp 154   70  38  27 -31  -8 normal
-   -1 sprites/tropic_forest.png 8bpp 202   70  16   9  17   3 normal
-   -1 sprites/tropic_forest.png 8bpp 234   70  15   9  -7  22 normal
-   -1 sprites/tropic_forest.png 8bpp 266   70  16   9 -31  11 normal
-   -1 sprites/tropic_forest.png 8bpp 298   70  15   9  -6  -8 normal
-   -1 sprites/tropic_forest.png 8bpp 330   70   8   7  25   5 normal
-   -1 sprites/tropic_forest.png 8bpp 346   70  10   5  -4  27 normal
-   -1 sprites/tropic_forest.png 8bpp 364   70   8   7 -31  11 normal
-   -1 sprites/tropic_forest.png 8bpp 380   70  12   6  -5  -8 normal
+   -1 sprites/tropic_forest.png  10  70 09 20 38  -5 -8
+   -1 sprites/tropic_forest.png  58  70 09 26 38  -5  5
+   -1 sprites/tropic_forest.png 106  70 09 20 37 -31 11
+   -1 sprites/tropic_forest.png 154  70 09 27 38 -31 -8
+   -1 sprites/tropic_forest.png 202  70 09  9 16  17  3
+   -1 sprites/tropic_forest.png 234  70 09  9 15  -7 22
+   -1 sprites/tropic_forest.png 266  70 09  9 16 -31 11
+   -1 sprites/tropic_forest.png 298  70 09  9 15  -6 -8
+   -1 sprites/tropic_forest.png 330  70 09  7  8  25  5
+   -1 sprites/tropic_forest.png 346  70 09  5 10  -4 27
+   -1 sprites/tropic_forest.png 364  70 09  7  8 -31 11
+   -1 sprites/tropic_forest.png 380  70 09  6 12  -5 -8

-   -1 sprites/tropic_forest.png 8bpp  10  100  39  18  -6   0 normal
-   -1 sprites/tropic_forest.png 8bpp  58  100  38  11  -5  12 normal
-   -1 sprites/tropic_forest.png 8bpp 106  100  39  18 -31   5 normal
-   -1 sprites/tropic_forest.png 8bpp 154  100  40  11 -32   0 normal
-   -1 sprites/tropic_forest.png 8bpp 202  100  20   6  13  12 normal
-   -1 sprites/tropic_forest.png 8bpp 234  100  13   7  -5  16 normal
-   -1 sprites/tropic_forest.png 8bpp 266  100  20   6 -31   5 normal
-   -1 sprites/tropic_forest.png 8bpp 298  100  13   7  -6   0 normal
-   -1 sprites/tropic_forest.png 8bpp 330  100   8   4  26  13 normal
-   -1 sprites/tropic_forest.png 8bpp 346  100  12   3  -5  20 normal
-   -1 sprites/tropic_forest.png 8bpp 364  100   8   5 -31   6 normal
-   -1 sprites/tropic_forest.png 8bpp 380  100  15   4  -6   0 normal
+   -1 sprites/tropic_forest.png  10 100 09 18 39  -6  0
+   -1 sprites/tropic_forest.png  58 100 09 11 38  -5 12
+   -1 sprites/tropic_forest.png 106 100 09 18 39 -31  5
+   -1 sprites/tropic_forest.png 154 100 09 11 40 -32  0
+   -1 sprites/tropic_forest.png 202 100 09  6 20  13 12
+   -1 sprites/tropic_forest.png 234 100 09  7 13  -5 16
+   -1 sprites/tropic_forest.png 266 100 09  6 20 -31  5
+   -1 sprites/tropic_forest.png 298 100 09  7 13  -6  0
+   -1 sprites/tropic_forest.png 330 100 09  4  8  26 13
+   -1 sprites/tropic_forest.png 346 100 09  3 12  -5 20
+   -1 sprites/tropic_forest.png 364 100 09  5  8 -31  6
+   -1 sprites/tropic_forest.png 380 100 09  4 15  -6  0

-   -1 sprites/tropic_forest.png 8bpp  10  130  38  27  -5  -8 normal
-   -1 sprites/tropic_forest.png 8bpp  58  130  37  20  -4  11 normal
-   -1 sprites/tropic_forest.png 8bpp 106  130  37  26 -31   5 normal
-   -1 sprites/tropic_forest.png 8bpp 154  130  38  20 -31  -8 normal
-   -1 sprites/tropic_forest.png 8bpp 202  130  16   9  17  11 normal
-   -1 sprites/tropic_forest.png 8bpp 234  130  15   9  -6  22 normal
-   -1 sprites/tropic_forest.png 8bpp 266  130  16   9 -31   3 normal
-   -1 sprites/tropic_forest.png 8bpp 298  130  15   9  -7  -8 normal
-   -1 sprites/tropic_forest.png 8bpp 330  130   8   7  25  11 normal
-   -1 sprites/tropic_forest.png 8bpp 346  130  10   5  -4  26 normal
-   -1 sprites/tropic_forest.png 8bpp 364  130   8   7 -31   5 normal
-   -1 sprites/tropic_forest.png 8bpp 380  130  12   6  -5  -8 normal
+   -1 sprites/tropic_forest.png  10 130 09 27 38  -5 -8
+   -1 sprites/tropic_forest.png  58 130 09 20 37  -4 11
+   -1 sprites/tropic_forest.png 106 130 09 26 37 -31  5
+   -1 sprites/tropic_forest.png 154 130 09 20 38 -31 -8
+   -1 sprites/tropic_forest.png 202 130 09  9 16  17 11
+   -1 sprites/tropic_forest.png 234 130 09  9 15  -6 22
+   -1 sprites/tropic_forest.png 266 130 09  9 16 -31  3
+   -1 sprites/tropic_forest.png 298 130 09  9 15  -7 -8
+   -1 sprites/tropic_forest.png 330 130 09  7  8  25 11
+   -1 sprites/tropic_forest.png 346 130 09  5 10  -4 26
+   -1 sprites/tropic_forest.png 364 130 09  7  8 -31  5
+   -1 sprites/tropic_forest.png 380 130 09  6 12  -5 -8
   -1 * 7	 02 05 41 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_desert.png 8bpp  10  210  38  19  -5   0 normal
-   -1 sprites/tropic_desert.png 8bpp  58  210  38  18  -5  13 normal
-   -1 sprites/tropic_desert.png 8bpp 106  210  38  18 -31  13 normal
-   -1 sprites/tropic_desert.png 8bpp 154  210  38  19 -31   0 normal
-   -1 sprites/tropic_desert.png 8bpp 202  210  19   9  14  11 normal
-   -1 sprites/tropic_desert.png 8bpp 234  210  16   9  -7  22 normal
-   -1 sprites/tropic_desert.png 8bpp 266  210  19   9 -31  11 normal
-   -1 sprites/tropic_desert.png 8bpp 298  210  16   9  -7   0 normal
-   -1 sprites/tropic_desert.png 8bpp 330  210   8   6  25  13 normal
-   -1 sprites/tropic_desert.png 8bpp 346  210  12   4  -5  27 normal
-   -1 sprites/tropic_desert.png 8bpp 364  210   8   6 -31  13 normal
-   -1 sprites/tropic_desert.png 8bpp 380  210  12   5  -5   0 normal
+   -1 sprites/tropic_desert.png  10 210 09 19 38  -5  0
+   -1 sprites/tropic_desert.png  58 210 09 18 38  -5 13
+   -1 sprites/tropic_desert.png 106 210 09 18 38 -31 13
+   -1 sprites/tropic_desert.png 154 210 09 19 38 -31  0
+   -1 sprites/tropic_desert.png 202 210 09  9 19  14 11
+   -1 sprites/tropic_desert.png 234 210 09  9 16  -7 22
+   -1 sprites/tropic_desert.png 266 210 09  9 19 -31 11
+   -1 sprites/tropic_desert.png 298 210 09  9 16  -7  0
+   -1 sprites/tropic_desert.png 330 210 09  6  8  25 13
+   -1 sprites/tropic_desert.png 346 210 09  4 12  -5 27
+   -1 sprites/tropic_desert.png 364 210 09  6  8 -31 13
+   -1 sprites/tropic_desert.png 380 210 09  5 12  -5  0

-   -1 sprites/tropic_desert.png 8bpp  10  240  40  11  -7   0 normal
-   -1 sprites/tropic_desert.png 8bpp  58  240  39  18  -6   5 normal
-   -1 sprites/tropic_desert.png 8bpp 106  240  38  11 -31  12 normal
-   -1 sprites/tropic_desert.png 8bpp 154  240  39  18 -31   0 normal
-   -1 sprites/tropic_desert.png 8bpp 202  240  20   6  13   5 normal
-   -1 sprites/tropic_desert.png 8bpp 234  240  13   7  -6  16 normal
-   -1 sprites/tropic_desert.png 8bpp 266  240  20   6 -31  12 normal
-   -1 sprites/tropic_desert.png 8bpp 298  240  13   7  -5   0 normal
-   -1 sprites/tropic_desert.png 8bpp 330  240   8   5  25   6 normal
-   -1 sprites/tropic_desert.png 8bpp 346  240  12   3  -5  20 normal
-   -1 sprites/tropic_desert.png 8bpp 364  240   8   4 -31  13 normal
-   -1 sprites/tropic_desert.png 8bpp 380  240  15   4  -7   0 normal
+   -1 sprites/tropic_desert.png  10 240 09 11 40  -7  0
+   -1 sprites/tropic_desert.png  58 240 09 18 39  -6  5
+   -1 sprites/tropic_desert.png 106 240 09 11 38 -31 12
+   -1 sprites/tropic_desert.png 154 240 09 18 39 -31  0
+   -1 sprites/tropic_desert.png 202 240 09  6 20  13  5
+   -1 sprites/tropic_desert.png 234 240 09  7 13  -6 16
+   -1 sprites/tropic_desert.png 266 240 09  6 20 -31 12
+   -1 sprites/tropic_desert.png 298 240 09  7 13  -5  0
+   -1 sprites/tropic_desert.png 330 240 09  5  8  25  6
+   -1 sprites/tropic_desert.png 346 240 09  3 12  -5 20
+   -1 sprites/tropic_desert.png 364 240 09  4  8 -31 13
+   -1 sprites/tropic_desert.png 380 240 09  4 15  -7  0

-   -1 sprites/tropic_desert.png 8bpp  10  270  38  20  -5  -8 normal
-   -1 sprites/tropic_desert.png 8bpp  58  270  38  26  -5   5 normal
-   -1 sprites/tropic_desert.png 8bpp 106  270  37  20 -31  11 normal
-   -1 sprites/tropic_desert.png 8bpp 154  270  38  27 -31  -8 normal
-   -1 sprites/tropic_desert.png 8bpp 202  270  16   9  17   3 normal
-   -1 sprites/tropic_desert.png 8bpp 234  270  15   9  -7  22 normal
-   -1 sprites/tropic_desert.png 8bpp 266  270  16   9 -31  11 normal
-   -1 sprites/tropic_desert.png 8bpp 298  270  15   9  -6  -8 normal
-   -1 sprites/tropic_desert.png 8bpp 330  270   8   7  25   5 normal
-   -1 sprites/tropic_desert.png 8bpp 346  270  10   5  -4  27 normal
-   -1 sprites/tropic_desert.png 8bpp 364  270   8   7 -31  11 normal
-   -1 sprites/tropic_desert.png 8bpp 380  270  12   6  -5  -8 normal
+   -1 sprites/tropic_desert.png  10 270 09 20 38  -5 -8
+   -1 sprites/tropic_desert.png  58 270 09 26 38  -5  5
+   -1 sprites/tropic_desert.png 106 270 09 20 37 -31 11
+   -1 sprites/tropic_desert.png 154 270 09 27 38 -31 -8
+   -1 sprites/tropic_desert.png 202 270 09  9 16  17  3
+   -1 sprites/tropic_desert.png 234 270 09  9 15  -7 22
+   -1 sprites/tropic_desert.png 266 270 09  9 16 -31 11
+   -1 sprites/tropic_desert.png 298 270 09  9 15  -6 -8
+   -1 sprites/tropic_desert.png 330 270 09  7  8  25  5
+   -1 sprites/tropic_desert.png 346 270 09  5 10  -4 27
+   -1 sprites/tropic_desert.png 364 270 09  7  8 -31 11
+   -1 sprites/tropic_desert.png 380 270 09  6 12  -5 -8

-   -1 sprites/tropic_desert.png 8bpp  10  300  39  18  -6   0 normal
-   -1 sprites/tropic_desert.png 8bpp  58  300  38  11  -5  12 normal
-   -1 sprites/tropic_desert.png 8bpp 106  300  39  18 -31   5 normal
-   -1 sprites/tropic_desert.png 8bpp 154  300  40  11 -32   0 normal
-   -1 sprites/tropic_desert.png 8bpp 202  300  20   6  13  12 normal
-   -1 sprites/tropic_desert.png 8bpp 234  300  13   7  -5  16 normal
-   -1 sprites/tropic_desert.png 8bpp 266  300  20   6 -31   5 normal
-   -1 sprites/tropic_desert.png 8bpp 298  300  13   7  -6   0 normal
-   -1 sprites/tropic_desert.png 8bpp 330  300   8   4  26  13 normal
-   -1 sprites/tropic_desert.png 8bpp 346  300  12   3  -5  20 normal
-   -1 sprites/tropic_desert.png 8bpp 364  300   8   5 -31   6 normal
-   -1 sprites/tropic_desert.png 8bpp 380  300  15   4  -6   0 normal
+   -1 sprites/tropic_desert.png  10 300 09 18 39  -6  0
+   -1 sprites/tropic_desert.png  58 300 09 11 38  -5 12
+   -1 sprites/tropic_desert.png 106 300 09 18 39 -31  5
+   -1 sprites/tropic_desert.png 154 300 09 11 40 -32  0
+   -1 sprites/tropic_desert.png 202 300 09  6 20  13 12
+   -1 sprites/tropic_desert.png 234 300 09  7 13  -5 16
+   -1 sprites/tropic_desert.png 266 300 09  6 20 -31  5
+   -1 sprites/tropic_desert.png 298 300 09  7 13  -6  0
+   -1 sprites/tropic_desert.png 330 300 09  4  8  26 13
+   -1 sprites/tropic_desert.png 346 300 09  3 12  -5 20
+   -1 sprites/tropic_desert.png 364 300 09  5  8 -31  6
+   -1 sprites/tropic_desert.png 380 300 09  4 15  -6  0

-   -1 sprites/tropic_desert.png 8bpp  10  330  38  27  -5  -8 normal
-   -1 sprites/tropic_desert.png 8bpp  58  330  37  20  -4  11 normal
-   -1 sprites/tropic_desert.png 8bpp 106  330  37  26 -31   5 normal
-   -1 sprites/tropic_desert.png 8bpp 154  330  38  20 -31  -8 normal
-   -1 sprites/tropic_desert.png 8bpp 202  330  16   9  17  11 normal
-   -1 sprites/tropic_desert.png 8bpp 234  330  15   9  -6  22 normal
-   -1 sprites/tropic_desert.png 8bpp 266  330  16   9 -31   3 normal
-   -1 sprites/tropic_desert.png 8bpp 298  330  15   9  -7  -8 normal
-   -1 sprites/tropic_desert.png 8bpp 330  330   8   7  25  11 normal
-   -1 sprites/tropic_desert.png 8bpp 346  330  10   5  -4  26 normal
-   -1 sprites/tropic_desert.png 8bpp 364  330   8   7 -31   5 normal
-   -1 sprites/tropic_desert.png 8bpp 380  330  12   6  -5  -8 normal
+   -1 sprites/tropic_desert.png  10 330 09 27 38  -5 -8
+   -1 sprites/tropic_desert.png  58 330 09 20 37  -4 11
+   -1 sprites/tropic_desert.png 106 330 09 26 37 -31  5
+   -1 sprites/tropic_desert.png 154 330 09 20 38 -31 -8
+   -1 sprites/tropic_desert.png 202 330 09  9 16  17 11
+   -1 sprites/tropic_desert.png 234 330 09  9 15  -6 22
+   -1 sprites/tropic_desert.png 266 330 09  9 16 -31  3
+   -1 sprites/tropic_desert.png 298 330 09  9 15  -7 -8
+   -1 sprites/tropic_desert.png 330 330 09  7  8  25 11
+   -1 sprites/tropic_desert.png 346 330 09  5 10  -4 26
+   -1 sprites/tropic_desert.png 364 330 09  7  8 -31  5
+   -1 sprites/tropic_desert.png 380 330 09  6 12  -5 -8
   -1 * 7	 02 05 42 01 00 00 00

   -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_forest.png 8bpp  10  210  38  19  -5   0 normal
-   -1 sprites/tropic_forest.png 8bpp  58  210  38  18  -5  13 normal
-   -1 sprites/tropic_forest.png 8bpp 106  210  38  18 -31  13 normal
-   -1 sprites/tropic_forest.png 8bpp 154  210  38  19 -31   0 normal
-   -1 sprites/tropic_forest.png 8bpp 202  210  19   9  14  11 normal
-   -1 sprites/tropic_forest.png 8bpp 234  210  16   9  -7  22 normal
-   -1 sprites/tropic_forest.png 8bpp 266  210  19   9 -31  11 normal
-   -1 sprites/tropic_forest.png 8bpp 298  210  16   9  -7   0 normal
-   -1 sprites/tropic_forest.png 8bpp 330  210   8   6  25  13 normal
-   -1 sprites/tropic_forest.png 8bpp 346  210  12   4  -5  27 normal
-   -1 sprites/tropic_forest.png 8bpp 364  210   8   6 -31  13 normal
-   -1 sprites/tropic_forest.png 8bpp 380  210  12   5  -5   0 normal
+   -1 sprites/tropic_forest.png  10 210 09 19 38  -5  0
+   -1 sprites/tropic_forest.png  58 210 09 18 38  -5 13
+   -1 sprites/tropic_forest.png 106 210 09 18 38 -31 13
+   -1 sprites/tropic_forest.png 154 210 09 19 38 -31  0
+   -1 sprites/tropic_forest.png 202 210 09  9 19  14 11
+   -1 sprites/tropic_forest.png 234 210 09  9 16  -7 22
+   -1 sprites/tropic_forest.png 266 210 09  9 19 -31 11
+   -1 sprites/tropic_forest.png 298 210 09  9 16  -7  0
+   -1 sprites/tropic_forest.png 330 210 09  6  8  25 13
+   -1 sprites/tropic_forest.png 346 210 09  4 12  -5 27
+   -1 sprites/tropic_forest.png 364 210 09  6  8 -31 13
+   -1 sprites/tropic_forest.png 380 210 09  5 12  -5  0

-   -1 sprites/tropic_forest.png 8bpp  10  240  40  11  -7   0 normal
-   -1 sprites/tropic_forest.png 8bpp  58  240  39  18  -6   5 normal
-   -1 sprites/tropic_forest.png 8bpp 106  240  38  11 -31  12 normal
-   -1 sprites/tropic_forest.png 8bpp 154  240  39  18 -31   0 normal
-   -1 sprites/tropic_forest.png 8bpp 202  240  20   6  13   5 normal
-   -1 sprites/tropic_forest.png 8bpp 234  240  13   7  -6  16 normal
-   -1 sprites/tropic_forest.png 8bpp 266  240  20   6 -31  12 normal
-   -1 sprites/tropic_forest.png 8bpp 298  240  13   7  -5   0 normal
-   -1 sprites/tropic_forest.png 8bpp 330  240   8   5  25   6 normal
-   -1 sprites/tropic_forest.png 8bpp 346  240  12   3  -5  20 normal
-   -1 sprites/tropic_forest.png 8bpp 364  240   8   4 -31  13 normal
-   -1 sprites/tropic_forest.png 8bpp 380  240  15   4  -7   0 normal
+   -1 sprites/tropic_forest.png  10 240 09 11 40  -7  0
+   -1 sprites/tropic_forest.png  58 240 09 18 39  -6  5
+   -1 sprites/tropic_forest.png 106 240 09 11 38 -31 12
+   -1 sprites/tropic_forest.png 154 240 09 18 39 -31  0
+   -1 sprites/tropic_forest.png 202 240 09  6 20  13  5
+   -1 sprites/tropic_forest.png 234 240 09  7 13  -6 16
+   -1 sprites/tropic_forest.png 266 240 09  6 20 -31 12
+   -1 sprites/tropic_forest.png 298 240 09  7 13  -5  0
+   -1 sprites/tropic_forest.png 330 240 09  5  8  25  6
+   -1 sprites/tropic_forest.png 346 240 09  3 12  -5 20
+   -1 sprites/tropic_forest.png 364 240 09  4  8 -31 13
+   -1 sprites/tropic_forest.png 380 240 09  4 15  -7  0

-   -1 sprites/tropic_forest.png 8bpp  10  270  38  20  -5  -8 normal
-   -1 sprites/tropic_forest.png 8bpp  58  270  38  26  -5   5 normal
-   -1 sprites/tropic_forest.png 8bpp 106  270  37  20 -31  11 normal
-   -1 sprites/tropic_forest.png 8bpp 154  270  38  27 -31  -8 normal
-   -1 sprites/tropic_forest.png 8bpp 202  270  16   9  17   3 normal
-   -1 sprites/tropic_forest.png 8bpp 234  270  15   9  -7  22 normal
-   -1 sprites/tropic_forest.png 8bpp 266  270  16   9 -31  11 normal
-   -1 sprites/tropic_forest.png 8bpp 298  270  15   9  -6  -8 normal
-   -1 sprites/tropic_forest.png 8bpp 330  270   8   7  25   5 normal
-   -1 sprites/tropic_forest.png 8bpp 346  270  10   5  -4  27 normal
-   -1 sprites/tropic_forest.png 8bpp 364  270   8   7 -31  11 normal
-   -1 sprites/tropic_forest.png 8bpp 380  270  12   6  -5  -8 normal
+   -1 sprites/tropic_forest.png  10 270 09 20 38  -5 -8
+   -1 sprites/tropic_forest.png  58 270 09 26 38  -5  5
+   -1 sprites/tropic_forest.png 106 270 09 20 37 -31 11
+   -1 sprites/tropic_forest.png 154 270 09 27 38 -31 -8
+   -1 sprites/tropic_forest.png 202 270 09  9 16  17  3
+   -1 sprites/tropic_forest.png 234 270 09  9 15  -7 22
+   -1 sprites/tropic_forest.png 266 270 09  9 16 -31 11
+   -1 sprites/tropic_forest.png 298 270 09  9 15  -6 -8
+   -1 sprites/tropic_forest.png 330 270 09  7  8  25  5
+   -1 sprites/tropic_forest.png 346 270 09  5 10  -4 27
+   -1 sprites/tropic_forest.png 364 270 09  7  8 -31 11
+   -1 sprites/tropic_forest.png 380 270 09  6 12  -5 -8

-   -1 sprites/tropic_forest.png 8bpp  10  300  39  18  -6   0 normal
-   -1 sprites/tropic_forest.png 8bpp  58  300  38  11  -5  12 normal
-   -1 sprites/tropic_forest.png 8bpp 106  300  39  18 -31   5 normal
-   -1 sprites/tropic_forest.png 8bpp 154  300  40  11 -32   0 normal
-   -1 sprites/tropic_forest.png 8bpp 202  300  20   6  13  12 normal
-   -1 sprites/tropic_forest.png 8bpp 234  300  13   7  -5  16 normal
-   -1 sprites/tropic_forest.png 8bpp 266  300  20   6 -31   5 normal
-   -1 sprites/tropic_forest.png 8bpp 298  300  13   7  -6   0 normal
-   -1 sprites/tropic_forest.png 8bpp 330  300   8   4  26  13 normal
-   -1 sprites/tropic_forest.png 8bpp 346  300  12   3  -5  20 normal
-   -1 sprites/tropic_forest.png 8bpp 364  300   8   5 -31   6 normal
-   -1 sprites/tropic_forest.png 8bpp 380  300  15   4  -6   0 normal
+   -1 sprites/tropic_forest.png  10 300 09 18 39  -6  0
+   -1 sprites/tropic_forest.png  58 300 09 11 38  -5 12
+   -1 sprites/tropic_forest.png 106 300 09 18 39 -31  5
+   -1 sprites/tropic_forest.png 154 300 09 11 40 -32  0
+   -1 sprites/tropic_forest.png 202 300 09  6 20  13 12
+   -1 sprites/tropic_forest.png 234 300 09  7 13  -5 16
+   -1 sprites/tropic_forest.png 266 300 09  6 20 -31  5
+   -1 sprites/tropic_forest.png 298 300 09  7 13  -6  0
+   -1 sprites/tropic_forest.png 330 300 09  4  8  26 13
+   -1 sprites/tropic_forest.png 346 300 09  3 12  -5 20
+   -1 sprites/tropic_forest.png 364 300 09  5  8 -31  6
+   -1 sprites/tropic_forest.png 380 300 09  4 15  -6  0

-   -1 sprites/tropic_forest.png 8bpp  10  330  38  27  -5  -8 normal
-   -1 sprites/tropic_forest.png 8bpp  58  330  37  20  -4  11 normal
-   -1 sprites/tropic_forest.png 8bpp 106  330  37  26 -31   5 normal
-   -1 sprites/tropic_forest.png 8bpp 154  330  38  20 -31  -8 normal
-   -1 sprites/tropic_forest.png 8bpp 202  330  16   9  17  11 normal
-   -1 sprites/tropic_forest.png 8bpp 234  330  15   9  -6  22 normal
-   -1 sprites/tropic_forest.png 8bpp 266  330  16   9 -31   3 normal
-   -1 sprites/tropic_forest.png 8bpp 298  330  15   9  -7  -8 normal
-   -1 sprites/tropic_forest.png 8bpp 330  330   8   7  25  11 normal
-   -1 sprites/tropic_forest.png 8bpp 346  330  10   5  -4  26 normal
-   -1 sprites/tropic_forest.png 8bpp 364  330   8   7 -31   5 normal
-   -1 sprites/tropic_forest.png 8bpp 380  330  12   6  -5  -8 normal
+   -1 sprites/tropic_forest.png  10 330 09 27 38  -5 -8
+   -1 sprites/tropic_forest.png  58 330 09 20 37  -4 11
+   -1 sprites/tropic_forest.png 106 330 09 26 37 -31  5
+   -1 sprites/tropic_forest.png 154 330 09 20 38 -31 -8
+   -1 sprites/tropic_forest.png 202 330 09  9 16  17 11
+   -1 sprites/tropic_forest.png 234 330 09  9 15  -6 22
+   -1 sprites/tropic_forest.png 266 330 09  9 16 -31  3
+   -1 sprites/tropic_forest.png 298 330 09  9 15  -7 -8
+   -1 sprites/tropic_forest.png 330 330 09  7  8  25 11
+   -1 sprites/tropic_forest.png 346 330 09  5 10  -4 26
+   -1 sprites/tropic_forest.png 364 330 09  7  8 -31  5
+   -1 sprites/tropic_forest.png 380 330 09  6 12  -5 -8
   -1 * 7	 02 05 43 01 00 00 00

   -1 * 14	 02 05 44 81 81 00 FF 01 40 00 01 01 41 00
--- a/media/extra_grf/roadstops.nfo
+++ b/media/extra_grf/roadstops.nfo
@@ -8,11 +8,11 @@
 //
   -1 * 0	 0C "Road stop graphics"
   -1 * 3	 05 11 08
-   -1 sprites/roadstops.png 8bpp  34    8  13  23   5 -11 normal
-   -1 sprites/roadstops.png 8bpp  66    8  13  15   5  -2 normal
-   -1 sprites/roadstops.png 8bpp  98    8  21  19 -20  -7 normal
-   -1 sprites/roadstops.png 8bpp 130    8  22  17 -25  -4 normal
-   -1 sprites/roadstops.png 8bpp 162    8  32  25  -5  -9 normal
-   -1 sprites/roadstops.png 8bpp 210    8  28  26  -3 -12 normal
-   -1 sprites/roadstops.png 8bpp 258    8  29  25 -24 -12 normal
-   -1 sprites/roadstops.png 8bpp 306    8  32  25 -25  -9 normal
+   -1 sprites/roadstops.png 34 8 09 23 13 5 -11
+   -1 sprites/roadstops.png 66 8 09 15 13 5 -2
+   -1 sprites/roadstops.png 98 8 09 19 21 -20 -7
+   -1 sprites/roadstops.png 130 8 09 17 22 -25 -4
+   -1 sprites/roadstops.png 162 8 09 25 32 -5 -9
+   -1 sprites/roadstops.png 210 8 09 26 28 -3 -12
+   -1 sprites/roadstops.png 258 8 09 25 29 -24 -12
+   -1 sprites/roadstops.png 306 8 09 25 32 -25 -9
--- a/media/extra_grf/shore.nfo
+++ b/media/extra_grf/shore.nfo
@@ -5,57 +5,71 @@
 // OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+//
+
+//
+// -- NFO Renum 'settings' --
+// Do not make nforenum warn about the fact that we use an incorrect number of shores
+// @@WARNING DISABLE 60
+// -- End of NFO Renum 'settings' --
 //

   -1 * 6	 07 83 01 \7! 00 0C
   -1 * 54	 0C "Missing shore tile graphics for the temperate climate"
   -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 8bpp  82    8  64  15 -31   0 normal
-   -1 sprites/shore.png 8bpp 162    8  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp 242    8  64  23 -31   0 normal
-   -1 sprites/shore.png 8bpp 322    8  64  47 -31 -16 normal
-   -1 sprites/shore.png 8bpp 402    8  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp 482    8  64  39 -31  -8 normal
-   -1 sprites/shore.png 8bpp 562    8  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp 642    8  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp 722    8  64  32 -31  -1 normal
-   -1 sprites/shore.png 8bpp   2   72  64  31 -31  -8 normal
+   -1 sprites/shore.png 82 8 09 15 64 -31 0
+   -1 sprites/shore.png 162 8 09 31 64 -31 -8
+   -1 sprites/shore.png 242 8 09 23 64 -31 0
+   -1 sprites/shore.png 322 8 09 47 64 -31 -16
+   -1 sprites/shore.png 402 8 09 31 64 -31 -8
+   -1 sprites/shore.png 482 8 09 39 64 -31 -8
+   -1 sprites/shore.png 562 8 09 31 64 -31 -8
+   -1 sprites/shore.png 642 8 09 31 64 -31 -8
+   -1 sprites/shore.png 722 8 09 32 64 -31 -1
+   -1 sprites/shore.png 2 72 09 31 64 -31 -8
   -1 * 6	 07 83 01 \7! 01 0C
   -1 * 55	 0C "Missing shore tile graphics for the sub-arctic climate"
   -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 8bpp 130   72  64  15 -31   0 normal
-   -1 sprites/shore.png 8bpp 210   72  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp 290   72  64  23 -31   0 normal
-   -1 sprites/shore.png 8bpp 370   72  64  47 -31 -16 normal
-   -1 sprites/shore.png 8bpp 450   72  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp 530   72  64  39 -31  -8 normal
-   -1 sprites/shore.png 8bpp 610   72  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp 690   72  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp   2  136  64  32 -31  -1 normal
-   -1 sprites/shore.png 8bpp  82  136  64  31 -31  -8 normal
+   -1 sprites/shore.png 130 72 09 15 64 -31 0
+   -1 sprites/shore.png 210 72 09 31 64 -31 -8
+   -1 sprites/shore.png 290 72 09 23 64 -31 0
+   -1 sprites/shore.png 370 72 09 47 64 -31 -16
+   -1 sprites/shore.png 450 72 09 31 64 -31 -8
+   -1 sprites/shore.png 530 72 09 39 64 -31 -8
+   -1 sprites/shore.png 610 72 09 31 64 -31 -8
+   -1 sprites/shore.png 690 72 09 31 64 -31 -8
+   -1 sprites/shore.png 2 136 09 32 64 -31 -1
+   -1 sprites/shore.png 82 136 09 31 64 -31 -8
   -1 * 6	 07 83 01 \7! 02 0C
   -1 * 57	 0C "Missing shore tile graphics for the sub-tropical climate"
   -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 8bpp 210  136  64  15 -31   0 normal
-   -1 sprites/shore.png 8bpp 290  136  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp 370  136  64  23 -31   0 normal
-   -1 sprites/shore.png 8bpp 450  136  64  47 -31 -16 normal
-   -1 sprites/shore.png 8bpp 530  136  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp 610  136  64  39 -31  -8 normal
-   -1 sprites/shore.png 8bpp 690  136  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp   2  200  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp  82  200  64  32 -31  -1 normal
-   -1 sprites/shore.png 8bpp 162  200  64  31 -31  -8 normal
+   -1 sprites/shore.png 210 136 09 15 64 -31 0
+   -1 sprites/shore.png 290 136 09 31 64 -31 -8
+   -1 sprites/shore.png 370 136 09 23 64 -31 0
+   -1 sprites/shore.png 450 136 09 47 64 -31 -16
+   -1 sprites/shore.png 530 136 09 31 64 -31 -8
+   -1 sprites/shore.png 610 136 09 39 64 -31 -8
+   -1 sprites/shore.png 690 136 09 31 64 -31 -8
+   -1 sprites/shore.png 2 200 09 31 64 -31 -8
+   -1 sprites/shore.png 82 200 09 32 64 -31 -1
+   -1 sprites/shore.png 162 200 09 31 64 -31 -8
   -1 * 6	 07 83 01 \7! 03 0C
   -1 * 44	 0C "Missing shore tile graphics for the toyland climate"
   -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 8bpp 290  200  64  15 -31   0 normal
-   -1 sprites/shore.png 8bpp 370  200  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp 450  200  64  23 -31   0 normal
-   -1 sprites/shore.png 8bpp 530  200  64  47 -31 -16 normal
-   -1 sprites/shore.png 8bpp 610  200  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp 690  200  64  39 -31  -8 normal
-   -1 sprites/shore.png 8bpp   2  264  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp  82  264  64  31 -31  -8 normal
-   -1 sprites/shore.png 8bpp 162  264  64  32 -31  -1 normal
-   -1 sprites/shore.png 8bpp 242  264  64  31 -31  -8 normal
+   -1 sprites/shore.png 290 200 09 15 64 -31 0
+   -1 sprites/shore.png 370 200 09 31 64 -31 -8
+   -1 sprites/shore.png 450 200 09 23 64 -31 0
+   -1 sprites/shore.png 530 200 09 47 64 -31 -16
+   -1 sprites/shore.png 610 200 09 31 64 -31 -8
+   -1 sprites/shore.png 690 200 09 39 64 -31 -8
+   -1 sprites/shore.png 2 264 09 31 64 -31 -8
+   -1 sprites/shore.png 82 264 09 31 64 -31 -8
+   -1 sprites/shore.png 162 264 09 32 64 -31 -1
+   -1 sprites/shore.png 242 264 09 31 64 -31 -8
+
+//
+// -- NFO Renum 'settings' --
+// Reset warning about incorrect number of shores
+// @@WARNING ENABLE 60
+// -- End of NFO Renum 'settings' --
+//
--- a/media/extra_grf/signals.nfo
+++ b/media/extra_grf/signals.nfo
@@ -8,486 +8,486 @@
 //
   -1 * 0	 0C "Pre-signal, semaphore, and PBS graphics by Michael Blunck"
   -1 * 3	 05 04 F0
-   -1 sprites/signals.png 8bpp  66    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp  82    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp  98    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 114    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 130    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 146    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 162    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 178    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 194    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 210    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 226    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 242    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 258    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 274    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 290    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 306    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 322    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 338    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 354    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 370    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 386    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 402    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 418    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 434    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 450    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 466    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 482    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 498    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 514    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 530    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 546    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 562    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 578    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 594    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 610    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 626    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 642    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 658    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 674    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 690    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 706    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 722    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 738    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 754    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 770    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 786    8   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp   2   40   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp  18   40   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp  34   40  10  21  -6 -19 normal
-   -1 sprites/signals.png 8bpp  50   40   7  23  -3 -21 normal
-   -1 sprites/signals.png 8bpp  66   40  10  21   1 -19 normal
-   -1 sprites/signals.png 8bpp  82   40   9  21   1 -19 normal
-   -1 sprites/signals.png 8bpp  98   40   9  21   1 -19 normal
-   -1 sprites/signals.png 8bpp 114   40   6  23   1 -21 normal
-   -1 sprites/signals.png 8bpp 130   40  10  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 146   40  10  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 162   40   2  21   1 -19 normal
-   -1 sprites/signals.png 8bpp 178   40   2  24   1 -22 normal
-   -1 sprites/signals.png 8bpp 194   40   2  23   1 -21 normal
-   -1 sprites/signals.png 8bpp 210   40   2  26   1 -24 normal
-   -1 sprites/signals.png 8bpp 226   40  11  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 242   40   8  21  -4 -19 normal
-   -1 sprites/signals.png 8bpp 258   40  11  21   1 -19 normal
-   -1 sprites/signals.png 8bpp 274   40   8  21   1 -19 normal
-   -1 sprites/signals.png 8bpp 290   40  12  21  -6 -19 normal
-   -1 sprites/signals.png 8bpp 322   40   9  23  -3 -21 normal
-   -1 sprites/signals.png 8bpp 338   40  12  21  -1 -19 normal
-   -1 sprites/signals.png 8bpp 370   40  11  21  -1 -19 normal
-   -1 sprites/signals.png 8bpp 386   40  11  21  -1 -19 normal
-   -1 sprites/signals.png 8bpp 402   40   8  23  -1 -21 normal
-   -1 sprites/signals.png 8bpp 418   40  12  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 450   40  12  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 482   40   4  21   1 -19 normal
-   -1 sprites/signals.png 8bpp 498   40   4  24   1 -22 normal
-   -1 sprites/signals.png 8bpp 514   40   4  23  -1 -21 normal
-   -1 sprites/signals.png 8bpp 530   40   4  26  -1 -24 normal
-   -1 sprites/signals.png 8bpp 546   40  13  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 578   40  10  21  -4 -19 normal
-   -1 sprites/signals.png 8bpp 594   40  13  21  -1 -19 normal
-   -1 sprites/signals.png 8bpp 626   40  10  21  -1 -19 normal
-   -1 sprites/signals.png 8bpp 642   40  11  21  -6 -19 normal
-   -1 sprites/signals.png 8bpp 658   40   8  23  -3 -21 normal
-   -1 sprites/signals.png 8bpp 674   40  11  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 690   40  10  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 706   40  10  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 722   40   7  23   0 -21 normal
-   -1 sprites/signals.png 8bpp 738   40  11  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 754   40  11  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 770   40   4  21   1 -19 normal
-   -1 sprites/signals.png 8bpp 786   40   4  24   1 -22 normal
-   -1 sprites/signals.png 8bpp   2   88   4  23  -1 -21 normal
-   -1 sprites/signals.png 8bpp  18   88   4  26  -1 -24 normal
-   -1 sprites/signals.png 8bpp  34   88  12  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp  66   88   9  21  -4 -19 normal
-   -1 sprites/signals.png 8bpp  82   88  12  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 114   88   9  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 130   88  11  21  -6 -19 normal
-   -1 sprites/signals.png 8bpp 146   88   8  23  -3 -21 normal
-   -1 sprites/signals.png 8bpp 162   88  11  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 178   88  10  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 194   88  10  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 210   88   7  23   0 -21 normal
-   -1 sprites/signals.png 8bpp 226   88  11  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 242   88  11  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 258   88   4  21   1 -19 normal
-   -1 sprites/signals.png 8bpp 274   88   4  24   1 -22 normal
-   -1 sprites/signals.png 8bpp 290   88   4  23  -1 -21 normal
-   -1 sprites/signals.png 8bpp 306   88   4  26  -1 -24 normal
-   -1 sprites/signals.png 8bpp 322   88  12  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 354   88   9  21  -4 -19 normal
-   -1 sprites/signals.png 8bpp 370   88  12  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 402   88   9  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 418   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 434   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 450   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 466   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 482   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 498   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 514   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 530   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 546   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 562   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 578   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 594   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 610   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 626   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 642   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 658   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 674   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 690   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 706   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 722   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 738   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 754   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 770   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 786   88   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp   2  136   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp  18  136   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp  34  136   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp  50  136   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp  66  136   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp  82  136   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp  98  136   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 114  136   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 130  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 146  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 162  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 178  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 194  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 210  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 226  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 242  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 258  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 274  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 290  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 306  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 322  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 338  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 354  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 370  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 386  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 402  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 418  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 434  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 450  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 466  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 482  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 498  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 514  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 530  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 546  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 562  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 578  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 594  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 610  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 626  136   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 642  136  10  21  -6 -19 normal
-   -1 sprites/signals.png 8bpp 658  136   7  23  -3 -21 normal
-   -1 sprites/signals.png 8bpp 674  136  10  21   1 -19 normal
-   -1 sprites/signals.png 8bpp 690  136   9  21   1 -19 normal
-   -1 sprites/signals.png 8bpp 706  136   9  21   1 -19 normal
-   -1 sprites/signals.png 8bpp 722  136   6  23   1 -21 normal
-   -1 sprites/signals.png 8bpp 738  136  10  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 754  136  10  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 770  136   2  21   1 -19 normal
-   -1 sprites/signals.png 8bpp 786  136   2  24   1 -22 normal
-   -1 sprites/signals.png 8bpp   2  184   2  23   1 -21 normal
-   -1 sprites/signals.png 8bpp  18  184   2  26   1 -24 normal
-   -1 sprites/signals.png 8bpp  34  184  11  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp  50  184   8  21  -4 -19 normal
-   -1 sprites/signals.png 8bpp  66  184  11  21   1 -19 normal
-   -1 sprites/signals.png 8bpp  82  184   8  21   1 -19 normal
-   -1 sprites/signals.png 8bpp  98  184  12  21  -6 -19 normal
-   -1 sprites/signals.png 8bpp 130  184   9  23  -3 -21 normal
-   -1 sprites/signals.png 8bpp 146  184  12  21  -1 -19 normal
-   -1 sprites/signals.png 8bpp 178  184  11  21  -1 -19 normal
-   -1 sprites/signals.png 8bpp 194  184  11  21  -1 -19 normal
-   -1 sprites/signals.png 8bpp 210  184   8  23  -1 -21 normal
-   -1 sprites/signals.png 8bpp 226  184  12  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 258  184  12  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 290  184   4  21  -1 -19 normal
-   -1 sprites/signals.png 8bpp 306  184   4  24  -1 -22 normal
-   -1 sprites/signals.png 8bpp 322  184   4  23   1 -21 normal
-   -1 sprites/signals.png 8bpp 338  184   4  26   1 -24 normal
-   -1 sprites/signals.png 8bpp 354  184  13  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 386  184  10  21  -4 -19 normal
-   -1 sprites/signals.png 8bpp 402  184  13  21  -1 -19 normal
-   -1 sprites/signals.png 8bpp 434  184  10  21  -1 -19 normal
-   -1 sprites/signals.png 8bpp 450  184  11  21  -6 -19 normal
-   -1 sprites/signals.png 8bpp 466  184   8  23  -3 -21 normal
-   -1 sprites/signals.png 8bpp 482  184  11  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 498  184  10  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 514  184  10  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 530  184   7  23   0 -21 normal
-   -1 sprites/signals.png 8bpp 546  184  11  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 562  184  11  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 578  184   4  21   1 -19 normal
-   -1 sprites/signals.png 8bpp 594  184   4  24   1 -22 normal
-   -1 sprites/signals.png 8bpp 610  184   4  23  -1 -21 normal
-   -1 sprites/signals.png 8bpp 626  184   4  26  -1 -24 normal
-   -1 sprites/signals.png 8bpp 642  184  12  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 674  184   9  21  -4 -19 normal
-   -1 sprites/signals.png 8bpp 690  184  12  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 722  184   9  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 738  184  11  21  -6 -19 normal
-   -1 sprites/signals.png 8bpp 754  184   8  23  -3 -21 normal
-   -1 sprites/signals.png 8bpp 770  184  11  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 786  184  10  21   0 -19 normal
-   -1 sprites/signals.png 8bpp   2  232  10  21   0 -19 normal
-   -1 sprites/signals.png 8bpp  18  232   7  23   0 -21 normal
-   -1 sprites/signals.png 8bpp  34  232  11  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp  50  232  11  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp  66  232   4  21   1 -19 normal
-   -1 sprites/signals.png 8bpp  82  232   4  24   1 -22 normal
-   -1 sprites/signals.png 8bpp  98  232   4  23  -1 -21 normal
-   -1 sprites/signals.png 8bpp 114  232   4  26  -1 -24 normal
-   -1 sprites/signals.png 8bpp 130  232  12  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 162  232   9  21  -4 -19 normal
-   -1 sprites/signals.png 8bpp 178  232  12  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 210  232   9  21   0 -19 normal
+   -1 sprites/signals.png 66 8 01 21 6 -2 -19
+   -1 sprites/signals.png 82 8 01 21 6 -2 -19
+   -1 sprites/signals.png 98 8 01 21 6 -2 -19
+   -1 sprites/signals.png 114 8 01 21 6 -2 -19
+   -1 sprites/signals.png 130 8 01 21 6 -2 -19
+   -1 sprites/signals.png 146 8 01 21 6 -2 -19
+   -1 sprites/signals.png 162 8 01 21 6 -2 -19
+   -1 sprites/signals.png 178 8 01 21 6 -2 -19
+   -1 sprites/signals.png 194 8 01 21 6 -2 -19
+   -1 sprites/signals.png 210 8 01 21 6 -2 -19
+   -1 sprites/signals.png 226 8 01 21 6 -2 -19
+   -1 sprites/signals.png 242 8 01 21 6 -2 -19
+   -1 sprites/signals.png 258 8 01 21 6 -2 -19
+   -1 sprites/signals.png 274 8 01 21 6 -2 -19
+   -1 sprites/signals.png 290 8 01 21 6 -2 -19
+   -1 sprites/signals.png 306 8 01 21 6 -2 -19
+   -1 sprites/signals.png 322 8 01 21 6 -2 -19
+   -1 sprites/signals.png 338 8 01 21 6 -2 -19
+   -1 sprites/signals.png 354 8 01 21 6 -2 -19
+   -1 sprites/signals.png 370 8 01 21 6 -2 -19
+   -1 sprites/signals.png 386 8 01 21 6 -2 -19
+   -1 sprites/signals.png 402 8 01 21 6 -2 -19
+   -1 sprites/signals.png 418 8 01 21 6 -2 -19
+   -1 sprites/signals.png 434 8 01 21 6 -2 -19
+   -1 sprites/signals.png 450 8 01 21 6 -2 -19
+   -1 sprites/signals.png 466 8 01 21 6 -2 -19
+   -1 sprites/signals.png 482 8 01 21 6 -2 -19
+   -1 sprites/signals.png 498 8 01 21 6 -2 -19
+   -1 sprites/signals.png 514 8 01 21 6 -2 -19
+   -1 sprites/signals.png 530 8 01 21 6 -2 -19
+   -1 sprites/signals.png 546 8 01 21 6 -2 -19
+   -1 sprites/signals.png 562 8 01 21 6 -2 -19
+   -1 sprites/signals.png 578 8 01 21 6 -2 -19
+   -1 sprites/signals.png 594 8 01 21 6 -2 -19
+   -1 sprites/signals.png 610 8 01 21 6 -2 -19
+   -1 sprites/signals.png 626 8 01 21 6 -2 -19
+   -1 sprites/signals.png 642 8 01 21 6 -2 -19
+   -1 sprites/signals.png 658 8 01 21 6 -2 -19
+   -1 sprites/signals.png 674 8 01 21 6 -2 -19
+   -1 sprites/signals.png 690 8 01 21 6 -2 -19
+   -1 sprites/signals.png 706 8 01 21 6 -2 -19
+   -1 sprites/signals.png 722 8 01 21 6 -2 -19
+   -1 sprites/signals.png 738 8 01 21 6 -2 -19
+   -1 sprites/signals.png 754 8 01 21 6 -2 -19
+   -1 sprites/signals.png 770 8 01 21 6 -2 -19
+   -1 sprites/signals.png 786 8 01 21 6 -2 -19
+   -1 sprites/signals.png 2 40 01 21 6 -2 -19
+   -1 sprites/signals.png 18 40 01 21 6 -2 -19
+   -1 sprites/signals.png 34 40 01 21 10 -6 -19
+   -1 sprites/signals.png 50 40 01 23 7 -3 -21
+   -1 sprites/signals.png 66 40 01 21 10 1 -19
+   -1 sprites/signals.png 82 40 01 21 9 1 -19
+   -1 sprites/signals.png 98 40 01 21 9 1 -19
+   -1 sprites/signals.png 114 40 01 23 6 1 -21
+   -1 sprites/signals.png 130 40 01 21 10 -7 -19
+   -1 sprites/signals.png 146 40 01 21 10 -7 -19
+   -1 sprites/signals.png 162 40 01 21 2 1 -19
+   -1 sprites/signals.png 178 40 01 24 2 1 -22
+   -1 sprites/signals.png 194 40 01 23 2 1 -21
+   -1 sprites/signals.png 210 40 01 26 2 1 -24
+   -1 sprites/signals.png 226 40 01 21 11 -7 -19
+   -1 sprites/signals.png 242 40 01 21 8 -4 -19
+   -1 sprites/signals.png 258 40 01 21 11 1 -19
+   -1 sprites/signals.png 274 40 01 21 8 1 -19
+   -1 sprites/signals.png 290 40 01 21 12 -6 -19
+   -1 sprites/signals.png 322 40 01 23 9 -3 -21
+   -1 sprites/signals.png 338 40 01 21 12 -1 -19
+   -1 sprites/signals.png 370 40 01 21 11 -1 -19
+   -1 sprites/signals.png 386 40 01 21 11 -1 -19
+   -1 sprites/signals.png 402 40 01 23 8 -1 -21
+   -1 sprites/signals.png 418 40 01 21 12 -7 -19
+   -1 sprites/signals.png 450 40 01 21 12 -7 -19
+   -1 sprites/signals.png 482 40 01 21 4 1 -19
+   -1 sprites/signals.png 498 40 01 24 4 1 -22
+   -1 sprites/signals.png 514 40 01 23 4 -1 -21
+   -1 sprites/signals.png 530 40 01 26 4 -1 -24
+   -1 sprites/signals.png 546 40 01 21 13 -7 -19
+   -1 sprites/signals.png 578 40 01 21 10 -4 -19
+   -1 sprites/signals.png 594 40 01 21 13 -1 -19
+   -1 sprites/signals.png 626 40 01 21 10 -1 -19
+   -1 sprites/signals.png 642 40 01 21 11 -6 -19
+   -1 sprites/signals.png 658 40 01 23 8 -3 -21
+   -1 sprites/signals.png 674 40 01 21 11 0 -19
+   -1 sprites/signals.png 690 40 01 21 10 0 -19
+   -1 sprites/signals.png 706 40 01 21 10 0 -19
+   -1 sprites/signals.png 722 40 01 23 7 0 -21
+   -1 sprites/signals.png 738 40 01 21 11 -7 -19
+   -1 sprites/signals.png 754 40 01 21 11 -7 -19
+   -1 sprites/signals.png 770 40 01 21 4 1 -19
+   -1 sprites/signals.png 786 40 01 24 4 1 -22
+   -1 sprites/signals.png 2 88 01 23 4 -1 -21
+   -1 sprites/signals.png 18 88 01 26 4 -1 -24
+   -1 sprites/signals.png 34 88 01 21 12 -7 -19
+   -1 sprites/signals.png 66 88 01 21 9 -4 -19
+   -1 sprites/signals.png 82 88 01 21 12 0 -19
+   -1 sprites/signals.png 114 88 01 21 9 0 -19
+   -1 sprites/signals.png 130 88 01 21 11 -6 -19
+   -1 sprites/signals.png 146 88 01 23 8 -3 -21
+   -1 sprites/signals.png 162 88 01 21 11 0 -19
+   -1 sprites/signals.png 178 88 01 21 10 0 -19
+   -1 sprites/signals.png 194 88 01 21 10 0 -19
+   -1 sprites/signals.png 210 88 01 23 7 0 -21
+   -1 sprites/signals.png 226 88 01 21 11 -7 -19
+   -1 sprites/signals.png 242 88 01 21 11 -7 -19
+   -1 sprites/signals.png 258 88 01 21 4 1 -19
+   -1 sprites/signals.png 274 88 01 24 4 1 -22
+   -1 sprites/signals.png 290 88 01 23 4 -1 -21
+   -1 sprites/signals.png 306 88 01 26 4 -1 -24
+   -1 sprites/signals.png 322 88 01 21 12 -7 -19
+   -1 sprites/signals.png 354 88 01 21 9 -4 -19
+   -1 sprites/signals.png 370 88 01 21 12 0 -19
+   -1 sprites/signals.png 402 88 01 21 9 0 -19
+   -1 sprites/signals.png 418 88 01 19 6 -2 -17
+   -1 sprites/signals.png 434 88 01 19 6 -2 -17
+   -1 sprites/signals.png 450 88 01 19 6 -2 -17
+   -1 sprites/signals.png 466 88 01 19 6 -2 -17
+   -1 sprites/signals.png 482 88 01 19 6 -2 -17
+   -1 sprites/signals.png 498 88 01 19 6 -2 -17
+   -1 sprites/signals.png 514 88 01 19 6 -2 -17
+   -1 sprites/signals.png 530 88 01 19 6 -2 -17
+   -1 sprites/signals.png 546 88 01 19 6 -2 -17
+   -1 sprites/signals.png 562 88 01 19 6 -2 -17
+   -1 sprites/signals.png 578 88 01 19 6 -2 -17
+   -1 sprites/signals.png 594 88 01 19 6 -2 -17
+   -1 sprites/signals.png 610 88 01 19 6 -2 -17
+   -1 sprites/signals.png 626 88 01 19 6 -2 -17
+   -1 sprites/signals.png 642 88 01 19 6 -2 -17
+   -1 sprites/signals.png 658 88 01 19 6 -2 -17
+   -1 sprites/signals.png 674 88 01 19 6 -2 -17
+   -1 sprites/signals.png 690 88 01 19 6 -2 -17
+   -1 sprites/signals.png 706 88 01 19 6 -2 -17
+   -1 sprites/signals.png 722 88 01 19 6 -2 -17
+   -1 sprites/signals.png 738 88 01 19 6 -2 -17
+   -1 sprites/signals.png 754 88 01 19 6 -2 -17
+   -1 sprites/signals.png 770 88 01 19 6 -2 -17
+   -1 sprites/signals.png 786 88 01 19 6 -2 -17
+   -1 sprites/signals.png 2 136 01 19 6 -2 -17
+   -1 sprites/signals.png 18 136 01 19 6 -2 -17
+   -1 sprites/signals.png 34 136 01 19 6 -2 -17
+   -1 sprites/signals.png 50 136 01 19 6 -2 -17
+   -1 sprites/signals.png 66 136 01 19 6 -2 -17
+   -1 sprites/signals.png 82 136 01 19 6 -2 -17
+   -1 sprites/signals.png 98 136 01 19 6 -2 -17
+   -1 sprites/signals.png 114 136 01 19 6 -2 -17
+   -1 sprites/signals.png 130 136 01 21 6 -2 -19
+   -1 sprites/signals.png 146 136 01 21 6 -2 -19
+   -1 sprites/signals.png 162 136 01 21 6 -2 -19
+   -1 sprites/signals.png 178 136 01 21 6 -2 -19
+   -1 sprites/signals.png 194 136 01 21 6 -2 -19
+   -1 sprites/signals.png 210 136 01 21 6 -2 -19
+   -1 sprites/signals.png 226 136 01 21 6 -2 -19
+   -1 sprites/signals.png 242 136 01 21 6 -2 -19
+   -1 sprites/signals.png 258 136 01 21 6 -2 -19
+   -1 sprites/signals.png 274 136 01 21 6 -2 -19
+   -1 sprites/signals.png 290 136 01 21 6 -2 -19
+   -1 sprites/signals.png 306 136 01 21 6 -2 -19
+   -1 sprites/signals.png 322 136 01 21 6 -2 -19
+   -1 sprites/signals.png 338 136 01 21 6 -2 -19
+   -1 sprites/signals.png 354 136 01 21 6 -2 -19
+   -1 sprites/signals.png 370 136 01 21 6 -2 -19
+   -1 sprites/signals.png 386 136 01 21 6 -2 -19
+   -1 sprites/signals.png 402 136 01 21 6 -2 -19
+   -1 sprites/signals.png 418 136 01 21 6 -2 -19
+   -1 sprites/signals.png 434 136 01 21 6 -2 -19
+   -1 sprites/signals.png 450 136 01 21 6 -2 -19
+   -1 sprites/signals.png 466 136 01 21 6 -2 -19
+   -1 sprites/signals.png 482 136 01 21 6 -2 -19
+   -1 sprites/signals.png 498 136 01 21 6 -2 -19
+   -1 sprites/signals.png 514 136 01 21 6 -2 -19
+   -1 sprites/signals.png 530 136 01 21 6 -2 -19
+   -1 sprites/signals.png 546 136 01 21 6 -2 -19
+   -1 sprites/signals.png 562 136 01 21 6 -2 -19
+   -1 sprites/signals.png 578 136 01 21 6 -2 -19
+   -1 sprites/signals.png 594 136 01 21 6 -2 -19
+   -1 sprites/signals.png 610 136 01 21 6 -2 -19
+   -1 sprites/signals.png 626 136 01 21 6 -2 -19
+   -1 sprites/signals.png 642 136 01 21 10 -6 -19
+   -1 sprites/signals.png 658 136 01 23 7 -3 -21
+   -1 sprites/signals.png 674 136 01 21 10 1 -19
+   -1 sprites/signals.png 690 136 01 21 9 1 -19
+   -1 sprites/signals.png 706 136 01 21 9 1 -19
+   -1 sprites/signals.png 722 136 01 23 6 1 -21
+   -1 sprites/signals.png 738 136 01 21 10 -7 -19
+   -1 sprites/signals.png 754 136 01 21 10 -7 -19
+   -1 sprites/signals.png 770 136 01 21 2 1 -19
+   -1 sprites/signals.png 786 136 01 24 2 1 -22
+   -1 sprites/signals.png 2 184 01 23 2 1 -21
+   -1 sprites/signals.png 18 184 01 26 2 1 -24
+   -1 sprites/signals.png 34 184 01 21 11 -7 -19
+   -1 sprites/signals.png 50 184 01 21 8 -4 -19
+   -1 sprites/signals.png 66 184 01 21 11 1 -19
+   -1 sprites/signals.png 82 184 01 21 8 1 -19
+   -1 sprites/signals.png 98 184 01 21 12 -6 -19
+   -1 sprites/signals.png 130 184 01 23 9 -3 -21
+   -1 sprites/signals.png 146 184 01 21 12 -1 -19
+   -1 sprites/signals.png 178 184 01 21 11 -1 -19
+   -1 sprites/signals.png 194 184 01 21 11 -1 -19
+   -1 sprites/signals.png 210 184 01 23 8 -1 -21
+   -1 sprites/signals.png 226 184 01 21 12 -7 -19
+   -1 sprites/signals.png 258 184 01 21 12 -7 -19
+   -1 sprites/signals.png 290 184 01 21 4 -1 -19
+   -1 sprites/signals.png 306 184 01 24 4 -1 -22
+   -1 sprites/signals.png 322 184 01 23 4 1 -21
+   -1 sprites/signals.png 338 184 01 26 4 1 -24
+   -1 sprites/signals.png 354 184 01 21 13 -7 -19
+   -1 sprites/signals.png 386 184 01 21 10 -4 -19
+   -1 sprites/signals.png 402 184 01 21 13 -1 -19
+   -1 sprites/signals.png 434 184 01 21 10 -1 -19
+   -1 sprites/signals.png 450 184 01 21 11 -6 -19
+   -1 sprites/signals.png 466 184 01 23 8 -3 -21
+   -1 sprites/signals.png 482 184 01 21 11 0 -19
+   -1 sprites/signals.png 498 184 01 21 10 0 -19
+   -1 sprites/signals.png 514 184 01 21 10 0 -19
+   -1 sprites/signals.png 530 184 01 23 7 0 -21
+   -1 sprites/signals.png 546 184 01 21 11 -7 -19
+   -1 sprites/signals.png 562 184 01 21 11 -7 -19
+   -1 sprites/signals.png 578 184 01 21 4 1 -19
+   -1 sprites/signals.png 594 184 01 24 4 1 -22
+   -1 sprites/signals.png 610 184 01 23 4 -1 -21
+   -1 sprites/signals.png 626 184 01 26 4 -1 -24
+   -1 sprites/signals.png 642 184 01 21 12 -7 -19
+   -1 sprites/signals.png 674 184 01 21 9 -4 -19
+   -1 sprites/signals.png 690 184 01 21 12 0 -19
+   -1 sprites/signals.png 722 184 01 21 9 0 -19
+   -1 sprites/signals.png 738 184 01 21 11 -6 -19
+   -1 sprites/signals.png 754 184 01 23 8 -3 -21
+   -1 sprites/signals.png 770 184 01 21 11 0 -19
+   -1 sprites/signals.png 786 184 01 21 10 0 -19
+   -1 sprites/signals.png 2 232 01 21 10 0 -19
+   -1 sprites/signals.png 18 232 01 23 7 0 -21
+   -1 sprites/signals.png 34 232 01 21 11 -7 -19
+   -1 sprites/signals.png 50 232 01 21 11 -7 -19
+   -1 sprites/signals.png 66 232 01 21 4 1 -19
+   -1 sprites/signals.png 82 232 01 24 4 1 -22
+   -1 sprites/signals.png 98 232 01 23 4 -1 -21
+   -1 sprites/signals.png 114 232 01 26 4 -1 -24
+   -1 sprites/signals.png 130 232 01 21 12 -7 -19
+   -1 sprites/signals.png 162 232 01 21 9 -4 -19
+   -1 sprites/signals.png 178 232 01 21 12 0 -19
+   -1 sprites/signals.png 210 232 01 21 9 0 -19
   -1 * 6	 07 85 01 \70 3B F2
   -1 * 6	 07 86 01 \70 04 F1
   -1 * 3	 05 04 F0
-   -1 sprites/signals.png 8bpp 274  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 290  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 306  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 322  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 338  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 354  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 370  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 386  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 402  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 418  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 434  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 450  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 466  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 482  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 498  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 514  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 530  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 546  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 562  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 578  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 594  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 610  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 626  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 642  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 658  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 674  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 690  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 706  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 722  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 738  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 754  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 770  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 786  232   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp   2  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp  18  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp  34  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp  50  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp  66  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp  82  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp  98  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 114  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 130  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 146  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 162  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 178  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 194  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 210  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 226  280   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 242  280  10  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 258  280  10  23  -8 -21 normal
-   -1 sprites/signals.png 8bpp 274  280  10  23  -7 -21 normal
-   -1 sprites/signals.png 8bpp 290  280   7  26  -5 -24 normal
-   -1 sprites/signals.png 8bpp 306  280  10  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 322  280  10  23  -6 -21 normal
-   -1 sprites/signals.png 8bpp 338  280  10  23   1 -21 normal
-   -1 sprites/signals.png 8bpp 354  280   7  26   2 -24 normal
-   -1 sprites/signals.png 8bpp 370  280   3  23   0 -21 normal
-   -1 sprites/signals.png 8bpp 386  280   3  26   0 -24 normal
-   -1 sprites/signals.png 8bpp 402  280   3  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 418  280   3  24   0 -22 normal
-   -1 sprites/signals.png 8bpp 434  280  12  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 466  280   9  24   0 -22 normal
-   -1 sprites/signals.png 8bpp 482  280  12  21  -9 -19 normal
-   -1 sprites/signals.png 8bpp 514  280   9  24  -6 -22 normal
-   -1 sprites/signals.png 8bpp 530  280  12  21  -9 -19 normal
-   -1 sprites/signals.png 8bpp 562  280  11  23  -9 -21 normal
-   -1 sprites/signals.png 8bpp 578  280  11  23  -7 -21 normal
-   -1 sprites/signals.png 8bpp 594  280   9  26  -5 -24 normal
-   -1 sprites/signals.png 8bpp 610  280  12  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 642  280  11  23  -6 -21 normal
-   -1 sprites/signals.png 8bpp 658  280  11  23   0 -21 normal
-   -1 sprites/signals.png 8bpp 674  280   9  26   0 -24 normal
-   -1 sprites/signals.png 8bpp 690  280   5  23   0 -21 normal
-   -1 sprites/signals.png 8bpp 706  280   5  26   0 -24 normal
-   -1 sprites/signals.png 8bpp 722  280   5  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 738  280   5  24  -2 -22 normal
-   -1 sprites/signals.png 8bpp 754  280  13  21  -1 -19 normal
-   -1 sprites/signals.png 8bpp 786  280  10  24  -1 -22 normal
-   -1 sprites/signals.png 8bpp   2  328  13  21  -9 -19 normal
-   -1 sprites/signals.png 8bpp  34  328  10  24  -6 -22 normal
-   -1 sprites/signals.png 8bpp  50  328  11  21  -8 -19 normal
-   -1 sprites/signals.png 8bpp  66  328  10  23  -8 -21 normal
-   -1 sprites/signals.png 8bpp  82  328  10  23  -7 -21 normal
-   -1 sprites/signals.png 8bpp  98  328   8  26  -5 -24 normal
-   -1 sprites/signals.png 8bpp 114  328  11  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 130  328  10  23  -6 -21 normal
-   -1 sprites/signals.png 8bpp 146  328  10  23   1 -21 normal
-   -1 sprites/signals.png 8bpp 162  328   8  26   1 -24 normal
-   -1 sprites/signals.png 8bpp 178  328   5  23   0 -21 normal
-   -1 sprites/signals.png 8bpp 194  328   5  26   0 -24 normal
-   -1 sprites/signals.png 8bpp 210  328   5  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 226  328   5  24  -2 -22 normal
-   -1 sprites/signals.png 8bpp 242  328  12  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 274  328   9  24   0 -22 normal
-   -1 sprites/signals.png 8bpp 290  328  12  21  -9 -19 normal
-   -1 sprites/signals.png 8bpp 322  328   9  24  -6 -22 normal
-   -1 sprites/signals.png 8bpp 338  328  11  21  -8 -19 normal
-   -1 sprites/signals.png 8bpp 354  328  10  23  -8 -21 normal
-   -1 sprites/signals.png 8bpp 370  328  10  23  -7 -21 normal
-   -1 sprites/signals.png 8bpp 386  328   8  26  -5 -24 normal
-   -1 sprites/signals.png 8bpp 402  328  11  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 418  328  10  23  -6 -21 normal
-   -1 sprites/signals.png 8bpp 434  328  10  23   1 -21 normal
-   -1 sprites/signals.png 8bpp 450  328   8  26   1 -24 normal
-   -1 sprites/signals.png 8bpp 466  328   5  23   0 -21 normal
-   -1 sprites/signals.png 8bpp 482  328   5  26   0 -24 normal
-   -1 sprites/signals.png 8bpp 498  328   5  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 514  328   5  24  -2 -22 normal
-   -1 sprites/signals.png 8bpp 530  328  12  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 562  328   9  24   0 -22 normal
-   -1 sprites/signals.png 8bpp 578  328  12  21  -9 -19 normal
-   -1 sprites/signals.png 8bpp 610  328   9  24  -6 -22 normal
-   -1 sprites/signals.png 8bpp 626  328   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 642  328   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 658  328   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 674  328   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 690  328   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 706  328   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 722  328   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 738  328   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 754  328   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 770  328   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 786  328   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp   2  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp  18  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp  34  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp  50  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp  66  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp  82  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp  98  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 114  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 130  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 146  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 162  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 178  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 194  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 210  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 226  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 242  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 258  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 274  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 290  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 306  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 322  376   6  19  -2 -17 normal
-   -1 sprites/signals.png 8bpp 338  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 354  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 370  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 386  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 402  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 418  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 434  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 450  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 466  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 482  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 498  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 514  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 530  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 546  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 562  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 578  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 594  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 610  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 626  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 642  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 658  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 674  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 690  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 706  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 722  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 738  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 754  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 770  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 786  376   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp   2  408   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp  18  408   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp  34  408   6  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp  50  408  10  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp  66  408  10  23  -8 -21 normal
-   -1 sprites/signals.png 8bpp  82  408  10  23  -7 -21 normal
-   -1 sprites/signals.png 8bpp  98  408   7  26  -5 -24 normal
-   -1 sprites/signals.png 8bpp 114  408  10  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 130  408  10  23  -6 -21 normal
-   -1 sprites/signals.png 8bpp 146  408  10  23   1 -21 normal
-   -1 sprites/signals.png 8bpp 162  408   7  26   2 -24 normal
-   -1 sprites/signals.png 8bpp 178  408   3  23   0 -21 normal
-   -1 sprites/signals.png 8bpp 194  408   3  26   0 -24 normal
-   -1 sprites/signals.png 8bpp 210  408   3  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 226  408   3  24   0 -22 normal
-   -1 sprites/signals.png 8bpp 242  408  12  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 274  408   9  24   0 -22 normal
-   -1 sprites/signals.png 8bpp 290  408  12  21  -9 -19 normal
-   -1 sprites/signals.png 8bpp 322  408   9  24  -6 -22 normal
-   -1 sprites/signals.png 8bpp 338  408  12  21  -9 -19 normal
-   -1 sprites/signals.png 8bpp 370  408  11  23  -9 -21 normal
-   -1 sprites/signals.png 8bpp 386  408  11  23  -7 -21 normal
-   -1 sprites/signals.png 8bpp 402  408   9  26  -5 -24 normal
-   -1 sprites/signals.png 8bpp 418  408  12  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 450  408  11  23  -6 -21 normal
-   -1 sprites/signals.png 8bpp 466  408  11  23   0 -21 normal
-   -1 sprites/signals.png 8bpp 482  408   9  26   0 -24 normal
-   -1 sprites/signals.png 8bpp 498  408   5  23  -1 -21 normal
-   -1 sprites/signals.png 8bpp 514  408   5  26  -1 -24 normal
-   -1 sprites/signals.png 8bpp 530  408   5  21  -1 -19 normal
-   -1 sprites/signals.png 8bpp 546  408   5  24  -1 -22 normal
-   -1 sprites/signals.png 8bpp 562  408  13  21  -1 -19 normal
-   -1 sprites/signals.png 8bpp 594  408  10  24  -1 -22 normal
-   -1 sprites/signals.png 8bpp 610  408  13  21  -9 -19 normal
-   -1 sprites/signals.png 8bpp 642  408  10  24  -6 -22 normal
-   -1 sprites/signals.png 8bpp 658  408  11  21  -8 -19 normal
-   -1 sprites/signals.png 8bpp 674  408  10  23  -8 -21 normal
-   -1 sprites/signals.png 8bpp 690  408  10  23  -7 -21 normal
-   -1 sprites/signals.png 8bpp 706  408   8  26  -5 -24 normal
-   -1 sprites/signals.png 8bpp 722  408  11  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 738  408  10  23  -6 -21 normal
-   -1 sprites/signals.png 8bpp 754  408  10  23   1 -21 normal
-   -1 sprites/signals.png 8bpp 770  408   8  26   1 -24 normal
-   -1 sprites/signals.png 8bpp 786  408   5  23   0 -21 normal
-   -1 sprites/signals.png 8bpp   2  456   5  26   0 -24 normal
-   -1 sprites/signals.png 8bpp  18  456   5  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp  34  456   5  24  -2 -22 normal
-   -1 sprites/signals.png 8bpp  50  456  12  21   0 -19 normal
-   -1 sprites/signals.png 8bpp  82  456   9  24   0 -22 normal
-   -1 sprites/signals.png 8bpp  98  456  12  21  -9 -19 normal
-   -1 sprites/signals.png 8bpp 130  456   9  24  -6 -22 normal
-   -1 sprites/signals.png 8bpp 146  456  11  21  -8 -19 normal
-   -1 sprites/signals.png 8bpp 162  456  10  23  -8 -21 normal
-   -1 sprites/signals.png 8bpp 178  456  10  23  -7 -21 normal
-   -1 sprites/signals.png 8bpp 194  456   8  26  -5 -24 normal
-   -1 sprites/signals.png 8bpp 210  456  11  21  -7 -19 normal
-   -1 sprites/signals.png 8bpp 226  456  10  23  -6 -21 normal
-   -1 sprites/signals.png 8bpp 242  456  10  23   1 -21 normal
-   -1 sprites/signals.png 8bpp 258  456   8  26   1 -24 normal
-   -1 sprites/signals.png 8bpp 274  456   5  23   0 -21 normal
-   -1 sprites/signals.png 8bpp 290  456   5  26   0 -24 normal
-   -1 sprites/signals.png 8bpp 306  456   5  21  -2 -19 normal
-   -1 sprites/signals.png 8bpp 322  456   5  24  -2 -22 normal
-   -1 sprites/signals.png 8bpp 338  456  12  21   0 -19 normal
-   -1 sprites/signals.png 8bpp 370  456   9  24   0 -22 normal
-   -1 sprites/signals.png 8bpp 386  456  12  21  -9 -19 normal
-   -1 sprites/signals.png 8bpp 418  456   9  24  -6 -22 normal
+   -1 sprites/signals.png 274 232 01 21 6 -2 -19
+   -1 sprites/signals.png 290 232 01 21 6 -2 -19
+   -1 sprites/signals.png 306 232 01 21 6 -2 -19
+   -1 sprites/signals.png 322 232 01 21 6 -2 -19
+   -1 sprites/signals.png 338 232 01 21 6 -2 -19
+   -1 sprites/signals.png 354 232 01 21 6 -2 -19
+   -1 sprites/signals.png 370 232 01 21 6 -2 -19
+   -1 sprites/signals.png 386 232 01 21 6 -2 -19
+   -1 sprites/signals.png 402 232 01 21 6 -2 -19
+   -1 sprites/signals.png 418 232 01 21 6 -2 -19
+   -1 sprites/signals.png 434 232 01 21 6 -2 -19
+   -1 sprites/signals.png 450 232 01 21 6 -2 -19
+   -1 sprites/signals.png 466 232 01 21 6 -2 -19
+   -1 sprites/signals.png 482 232 01 21 6 -2 -19
+   -1 sprites/signals.png 498 232 01 21 6 -2 -19
+   -1 sprites/signals.png 514 232 01 21 6 -2 -19
+   -1 sprites/signals.png 530 232 01 21 6 -2 -19
+   -1 sprites/signals.png 546 232 01 21 6 -2 -19
+   -1 sprites/signals.png 562 232 01 21 6 -2 -19
+   -1 sprites/signals.png 578 232 01 21 6 -2 -19
+   -1 sprites/signals.png 594 232 01 21 6 -2 -19
+   -1 sprites/signals.png 610 232 01 21 6 -2 -19
+   -1 sprites/signals.png 626 232 01 21 6 -2 -19
+   -1 sprites/signals.png 642 232 01 21 6 -2 -19
+   -1 sprites/signals.png 658 232 01 21 6 -2 -19
+   -1 sprites/signals.png 674 232 01 21 6 -2 -19
+   -1 sprites/signals.png 690 232 01 21 6 -2 -19
+   -1 sprites/signals.png 706 232 01 21 6 -2 -19
+   -1 sprites/signals.png 722 232 01 21 6 -2 -19
+   -1 sprites/signals.png 738 232 01 21 6 -2 -19
+   -1 sprites/signals.png 754 232 01 21 6 -2 -19
+   -1 sprites/signals.png 770 232 01 21 6 -2 -19
+   -1 sprites/signals.png 786 232 01 21 6 -2 -19
+   -1 sprites/signals.png 2 280 01 21 6 -2 -19
+   -1 sprites/signals.png 18 280 01 21 6 -2 -19
+   -1 sprites/signals.png 34 280 01 21 6 -2 -19
+   -1 sprites/signals.png 50 280 01 21 6 -2 -19
+   -1 sprites/signals.png 66 280 01 21 6 -2 -19
+   -1 sprites/signals.png 82 280 01 21 6 -2 -19
+   -1 sprites/signals.png 98 280 01 21 6 -2 -19
+   -1 sprites/signals.png 114 280 01 21 6 -2 -19
+   -1 sprites/signals.png 130 280 01 21 6 -2 -19
+   -1 sprites/signals.png 146 280 01 21 6 -2 -19
+   -1 sprites/signals.png 162 280 01 21 6 -2 -19
+   -1 sprites/signals.png 178 280 01 21 6 -2 -19
+   -1 sprites/signals.png 194 280 01 21 6 -2 -19
+   -1 sprites/signals.png 210 280 01 21 6 -2 -19
+   -1 sprites/signals.png 226 280 01 21 6 -2 -19
+   -1 sprites/signals.png 242 280 01 21 10 -7 -19
+   -1 sprites/signals.png 258 280 01 23 10 -8 -21
+   -1 sprites/signals.png 274 280 01 23 10 -7 -21
+   -1 sprites/signals.png 290 280 01 26 7 -5 -24
+   -1 sprites/signals.png 306 280 01 21 10 -7 -19
+   -1 sprites/signals.png 322 280 01 23 10 -6 -21
+   -1 sprites/signals.png 338 280 01 23 10 1 -21
+   -1 sprites/signals.png 354 280 01 26 7 2 -24
+   -1 sprites/signals.png 370 280 01 23 3 0 -21
+   -1 sprites/signals.png 386 280 01 26 3 0 -24
+   -1 sprites/signals.png 402 280 01 21 3 0 -19
+   -1 sprites/signals.png 418 280 01 24 3 0 -22
+   -1 sprites/signals.png 434 280 01 21 12 0 -19
+   -1 sprites/signals.png 466 280 01 24 9 0 -22
+   -1 sprites/signals.png 482 280 01 21 12 -9 -19
+   -1 sprites/signals.png 514 280 01 24 9 -6 -22
+   -1 sprites/signals.png 530 280 01 21 12 -9 -19
+   -1 sprites/signals.png 562 280 01 23 11 -9 -21
+   -1 sprites/signals.png 578 280 01 23 11 -7 -21
+   -1 sprites/signals.png 594 280 01 26 9 -5 -24
+   -1 sprites/signals.png 610 280 01 21 12 -7 -19
+   -1 sprites/signals.png 642 280 01 23 11 -6 -21
+   -1 sprites/signals.png 658 280 01 23 11 0 -21
+   -1 sprites/signals.png 674 280 01 26 9 0 -24
+   -1 sprites/signals.png 690 280 01 23 5 0 -21
+   -1 sprites/signals.png 706 280 01 26 5 0 -24
+   -1 sprites/signals.png 722 280 01 21 5 -2 -19
+   -1 sprites/signals.png 738 280 01 24 5 -2 -22
+   -1 sprites/signals.png 754 280 01 21 13 -1 -19
+   -1 sprites/signals.png 786 280 01 24 10 -1 -22
+   -1 sprites/signals.png 2 328 01 21 13 -9 -19
+   -1 sprites/signals.png 34 328 01 24 10 -6 -22
+   -1 sprites/signals.png 50 328 01 21 11 -8 -19
+   -1 sprites/signals.png 66 328 01 23 10 -8 -21
+   -1 sprites/signals.png 82 328 01 23 10 -7 -21
+   -1 sprites/signals.png 98 328 01 26 8 -5 -24
+   -1 sprites/signals.png 114 328 01 21 11 -7 -19
+   -1 sprites/signals.png 130 328 01 23 10 -6 -21
+   -1 sprites/signals.png 146 328 01 23 10 1 -21
+   -1 sprites/signals.png 162 328 01 26 8 1 -24
+   -1 sprites/signals.png 178 328 01 23 5 0 -21
+   -1 sprites/signals.png 194 328 01 26 5 0 -24
+   -1 sprites/signals.png 210 328 01 21 5 -2 -19
+   -1 sprites/signals.png 226 328 01 24 5 -2 -22
+   -1 sprites/signals.png 242 328 01 21 12 0 -19
+   -1 sprites/signals.png 274 328 01 24 9 0 -22
+   -1 sprites/signals.png 290 328 01 21 12 -9 -19
+   -1 sprites/signals.png 322 328 01 24 9 -6 -22
+   -1 sprites/signals.png 338 328 01 21 11 -8 -19
+   -1 sprites/signals.png 354 328 01 23 10 -8 -21
+   -1 sprites/signals.png 370 328 01 23 10 -7 -21
+   -1 sprites/signals.png 386 328 01 26 8 -5 -24
+   -1 sprites/signals.png 402 328 01 21 11 -7 -19
+   -1 sprites/signals.png 418 328 01 23 10 -6 -21
+   -1 sprites/signals.png 434 328 01 23 10 1 -21
+   -1 sprites/signals.png 450 328 01 26 8 1 -24
+   -1 sprites/signals.png 466 328 01 23 5 0 -21
+   -1 sprites/signals.png 482 328 01 26 5 0 -24
+   -1 sprites/signals.png 498 328 01 21 5 -2 -19
+   -1 sprites/signals.png 514 328 01 24 5 -2 -22
+   -1 sprites/signals.png 530 328 01 21 12 0 -19
+   -1 sprites/signals.png 562 328 01 24 9 0 -22
+   -1 sprites/signals.png 578 328 01 21 12 -9 -19
+   -1 sprites/signals.png 610 328 01 24 9 -6 -22
+   -1 sprites/signals.png 626 328 01 19 6 -2 -17
+   -1 sprites/signals.png 642 328 01 19 6 -2 -17
+   -1 sprites/signals.png 658 328 01 19 6 -2 -17
+   -1 sprites/signals.png 674 328 01 19 6 -2 -17
+   -1 sprites/signals.png 690 328 01 19 6 -2 -17
+   -1 sprites/signals.png 706 328 01 19 6 -2 -17
+   -1 sprites/signals.png 722 328 01 19 6 -2 -17
+   -1 sprites/signals.png 738 328 01 19 6 -2 -17
+   -1 sprites/signals.png 754 328 01 19 6 -2 -17
+   -1 sprites/signals.png 770 328 01 19 6 -2 -17
+   -1 sprites/signals.png 786 328 01 19 6 -2 -17
+   -1 sprites/signals.png 2 376 01 19 6 -2 -17
+   -1 sprites/signals.png 18 376 01 19 6 -2 -17
+   -1 sprites/signals.png 34 376 01 19 6 -2 -17
+   -1 sprites/signals.png 50 376 01 19 6 -2 -17
+   -1 sprites/signals.png 66 376 01 19 6 -2 -17
+   -1 sprites/signals.png 82 376 01 19 6 -2 -17
+   -1 sprites/signals.png 98 376 01 19 6 -2 -17
+   -1 sprites/signals.png 114 376 01 19 6 -2 -17
+   -1 sprites/signals.png 130 376 01 19 6 -2 -17
+   -1 sprites/signals.png 146 376 01 19 6 -2 -17
+   -1 sprites/signals.png 162 376 01 19 6 -2 -17
+   -1 sprites/signals.png 178 376 01 19 6 -2 -17
+   -1 sprites/signals.png 194 376 01 19 6 -2 -17
+   -1 sprites/signals.png 210 376 01 19 6 -2 -17
+   -1 sprites/signals.png 226 376 01 19 6 -2 -17
+   -1 sprites/signals.png 242 376 01 19 6 -2 -17
+   -1 sprites/signals.png 258 376 01 19 6 -2 -17
+   -1 sprites/signals.png 274 376 01 19 6 -2 -17
+   -1 sprites/signals.png 290 376 01 19 6 -2 -17
+   -1 sprites/signals.png 306 376 01 19 6 -2 -17
+   -1 sprites/signals.png 322 376 01 19 6 -2 -17
+   -1 sprites/signals.png 338 376 01 21 6 -2 -19
+   -1 sprites/signals.png 354 376 01 21 6 -2 -19
+   -1 sprites/signals.png 370 376 01 21 6 -2 -19
+   -1 sprites/signals.png 386 376 01 21 6 -2 -19
+   -1 sprites/signals.png 402 376 01 21 6 -2 -19
+   -1 sprites/signals.png 418 376 01 21 6 -2 -19
+   -1 sprites/signals.png 434 376 01 21 6 -2 -19
+   -1 sprites/signals.png 450 376 01 21 6 -2 -19
+   -1 sprites/signals.png 466 376 01 21 6 -2 -19
+   -1 sprites/signals.png 482 376 01 21 6 -2 -19
+   -1 sprites/signals.png 498 376 01 21 6 -2 -19
+   -1 sprites/signals.png 514 376 01 21 6 -2 -19
+   -1 sprites/signals.png 530 376 01 21 6 -2 -19
+   -1 sprites/signals.png 546 376 01 21 6 -2 -19
+   -1 sprites/signals.png 562 376 01 21 6 -2 -19
+   -1 sprites/signals.png 578 376 01 21 6 -2 -19
+   -1 sprites/signals.png 594 376 01 21 6 -2 -19
+   -1 sprites/signals.png 610 376 01 21 6 -2 -19
+   -1 sprites/signals.png 626 376 01 21 6 -2 -19
+   -1 sprites/signals.png 642 376 01 21 6 -2 -19
+   -1 sprites/signals.png 658 376 01 21 6 -2 -19
+   -1 sprites/signals.png 674 376 01 21 6 -2 -19
+   -1 sprites/signals.png 690 376 01 21 6 -2 -19
+   -1 sprites/signals.png 706 376 01 21 6 -2 -19
+   -1 sprites/signals.png 722 376 01 21 6 -2 -19
+   -1 sprites/signals.png 738 376 01 21 6 -2 -19
+   -1 sprites/signals.png 754 376 01 21 6 -2 -19
+   -1 sprites/signals.png 770 376 01 21 6 -2 -19
+   -1 sprites/signals.png 786 376 01 21 6 -2 -19
+   -1 sprites/signals.png 2 408 01 21 6 -2 -19
+   -1 sprites/signals.png 18 408 01 21 6 -2 -19
+   -1 sprites/signals.png 34 408 01 21 6 -2 -19
+   -1 sprites/signals.png 50 408 01 21 10 -7 -19
+   -1 sprites/signals.png 66 408 01 23 10 -8 -21
+   -1 sprites/signals.png 82 408 01 23 10 -7 -21
+   -1 sprites/signals.png 98 408 01 26 7 -5 -24
+   -1 sprites/signals.png 114 408 01 21 10 -7 -19
+   -1 sprites/signals.png 130 408 01 23 10 -6 -21
+   -1 sprites/signals.png 146 408 01 23 10 1 -21
+   -1 sprites/signals.png 162 408 01 26 7 2 -24
+   -1 sprites/signals.png 178 408 01 23 3 0 -21
+   -1 sprites/signals.png 194 408 01 26 3 0 -24
+   -1 sprites/signals.png 210 408 01 21 3 0 -19
+   -1 sprites/signals.png 226 408 01 24 3 0 -22
+   -1 sprites/signals.png 242 408 01 21 12 0 -19
+   -1 sprites/signals.png 274 408 01 24 9 0 -22
+   -1 sprites/signals.png 290 408 01 21 12 -9 -19
+   -1 sprites/signals.png 322 408 01 24 9 -6 -22
+   -1 sprites/signals.png 338 408 01 21 12 -9 -19
+   -1 sprites/signals.png 370 408 01 23 11 -9 -21
+   -1 sprites/signals.png 386 408 01 23 11 -7 -21
+   -1 sprites/signals.png 402 408 01 26 9 -5 -24
+   -1 sprites/signals.png 418 408 01 21 12 -7 -19
+   -1 sprites/signals.png 450 408 01 23 11 -6 -21
+   -1 sprites/signals.png 466 408 01 23 11 0 -21
+   -1 sprites/signals.png 482 408 01 26 9 0 -24
+   -1 sprites/signals.png 498 408 01 23 5 -1 -21
+   -1 sprites/signals.png 514 408 01 26 5 -1 -24
+   -1 sprites/signals.png 530 408 01 21 5 -1 -19
+   -1 sprites/signals.png 546 408 01 24 5 -1 -22
+   -1 sprites/signals.png 562 408 01 21 13 -1 -19
+   -1 sprites/signals.png 594 408 01 24 10 -1 -22
+   -1 sprites/signals.png 610 408 01 21 13 -9 -19
+   -1 sprites/signals.png 642 408 01 24 10 -6 -22
+   -1 sprites/signals.png 658 408 01 21 11 -8 -19
+   -1 sprites/signals.png 674 408 01 23 10 -8 -21
+   -1 sprites/signals.png 690 408 01 23 10 -7 -21
+   -1 sprites/signals.png 706 408 01 26 8 -5 -24
+   -1 sprites/signals.png 722 408 01 21 11 -7 -19
+   -1 sprites/signals.png 738 408 01 23 10 -6 -21
+   -1 sprites/signals.png 754 408 01 23 10 1 -21
+   -1 sprites/signals.png 770 408 01 26 8 1 -24
+   -1 sprites/signals.png 786 408 01 23 5 0 -21
+   -1 sprites/signals.png 2 456 01 26 5 0 -24
+   -1 sprites/signals.png 18 456 01 21 5 -2 -19
+   -1 sprites/signals.png 34 456 01 24 5 -2 -22
+   -1 sprites/signals.png 50 456 01 21 12 0 -19
+   -1 sprites/signals.png 82 456 01 24 9 0 -22
+   -1 sprites/signals.png 98 456 01 21 12 -9 -19
+   -1 sprites/signals.png 130 456 01 24 9 -6 -22
+   -1 sprites/signals.png 146 456 01 21 11 -8 -19
+   -1 sprites/signals.png 162 456 01 23 10 -8 -21
+   -1 sprites/signals.png 178 456 01 23 10 -7 -21
+   -1 sprites/signals.png 194 456 01 26 8 -5 -24
+   -1 sprites/signals.png 210 456 01 21 11 -7 -19
+   -1 sprites/signals.png 226 456 01 23 10 -6 -21
+   -1 sprites/signals.png 242 456 01 23 10 1 -21
+   -1 sprites/signals.png 258 456 01 26 8 1 -24
+   -1 sprites/signals.png 274 456 01 23 5 0 -21
+   -1 sprites/signals.png 290 456 01 26 5 0 -24
+   -1 sprites/signals.png 306 456 01 21 5 -2 -19
+   -1 sprites/signals.png 322 456 01 24 5 -2 -22
+   -1 sprites/signals.png 338 456 01 21 12 0 -19
+   -1 sprites/signals.png 370 456 01 24 9 0 -22
+   -1 sprites/signals.png 386 456 01 21 12 -9 -19
+   -1 sprites/signals.png 418 456 01 24 9 -6 -22
--- a/media/extra_grf/sloped_tracks.nfo
+++ b/media/extra_grf/sloped_tracks.nfo
@@ -8,15 +8,15 @@
 //
   -1 * 0	 0C "Sloped tracks"
   -1 * 3	 05 0F 0C
-   -1 sprites/sloped_tracks.png 8bpp  50    8  42  29 -19  -3 normal
-   -1 sprites/sloped_tracks.png 8bpp  98    8  41  13 -20   5 normal
-   -1 sprites/sloped_tracks.png 8bpp 146    8  42  14 -19   5 normal
-   -1 sprites/sloped_tracks.png 8bpp 194    8  42  29 -21  -3 normal
-   -1 sprites/sloped_tracks.png 8bpp 242    8  33  25 -15  -1 normal
-   -1 sprites/sloped_tracks.png 8bpp 290    8  33  10 -15   7 normal
-   -1 sprites/sloped_tracks.png 8bpp 338    8  34  10 -15   7 normal
-   -1 sprites/sloped_tracks.png 8bpp 386    8  34  25 -15  -1 normal
-   -1 sprites/sloped_tracks.png 8bpp 434    8  31  23 -13  -1 normal
-   -1 sprites/sloped_tracks.png 8bpp 482    8  32  10 -15   7 normal
-   -1 sprites/sloped_tracks.png 8bpp 530    8  31  10 -15   7 normal
-   -1 sprites/sloped_tracks.png 8bpp 578    8  31  23 -16  -1 normal
+   -1 sprites/sloped_tracks.png 50 8 09 29 42 -19 -3
+   -1 sprites/sloped_tracks.png 98 8 09 13 41 -20 5
+   -1 sprites/sloped_tracks.png 146 8 09 14 42 -19 5
+   -1 sprites/sloped_tracks.png 194 8 09 29 42 -21 -3
+   -1 sprites/sloped_tracks.png 242 8 09 25 33 -15 -1
+   -1 sprites/sloped_tracks.png 290 8 09 10 33 -15 7
+   -1 sprites/sloped_tracks.png 338 8 09 10 34 -15 7
+   -1 sprites/sloped_tracks.png 386 8 09 25 34 -15 -1
+   -1 sprites/sloped_tracks.png 434 8 09 23 31 -13 -1
+   -1 sprites/sloped_tracks.png 482 8 09 10 32 -15 7
+   -1 sprites/sloped_tracks.png 530 8 09 10 31 -15 7
+   -1 sprites/sloped_tracks.png 578 8 09 23 31 -16 -1
--- a/media/extra_grf/tramtracks.nfo
+++ b/media/extra_grf/tramtracks.nfo
@@ -8,116 +8,116 @@
 //
   -1 * 0	 0C "Tram track graphics by PikkaBird"
   -1 * 3	 05 0B 71
-   -1 sprites/tramtracks.png 8bpp  18    8  20  13   0   4 normal
-   -1 sprites/tramtracks.png 8bpp  50    8  20  13   0   4 normal
-   -1 sprites/tramtracks.png 8bpp  82    8  64  36 -18  -8 normal
-   -1 sprites/tramtracks.png 8bpp 162    8  62  36 -16  -8 normal
-   -1 sprites/tramtracks.png 8bpp 242    8  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 322    8  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 402    8  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 482    8  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 562    8  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 642    8  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 722    8  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp   2   56  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp  82   56  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 162   56  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 242   56  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 322   56  64  39 -31  -8 normal
-   -1 sprites/tramtracks.png 8bpp 402   56  64  23 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 482   56  64  23 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 562   56  64  39 -31  -8 normal
-   -1 sprites/tramtracks.png 8bpp 642   56  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 722   56  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp   2  120  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp  82  120  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 162  120  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 242  120  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 322  120  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 402  120  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 482  120  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 562  120  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 642  120  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 722  120  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp   2  168  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp  82  168  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 162  168  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 242  168  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 322  168  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 402  168  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 482  168  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 562  168  64  39 -31  -8 normal
-   -1 sprites/tramtracks.png 8bpp 642  168  64  23 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 722  168  64  23 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp   2  232  64  39 -31  -8 normal
-   -1 sprites/tramtracks.png 8bpp  82  232  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 162  232  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 242  232  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 322  232  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 402  232  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 482  232  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 562  232  20  20   0   0 normal
-   -1 sprites/tramtracks.png 8bpp 594  232  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 674  232  62  64   2 -49 normal
-   -1 sprites/tramtracks.png 8bpp   2  312  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp  82  312  62  64 -62 -49 normal
-   -1 sprites/tramtracks.png 8bpp 162  312  62  64 -62 -49 normal
-   -1 sprites/tramtracks.png 8bpp 242  312  62  64   2 -49 normal
-   -1 sprites/tramtracks.png 8bpp 322  312  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 402  312  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 482  312  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 562  312  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 642  312  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 722  312  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp   2  392  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp  82  392  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 162  392  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 242  392  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 322  392  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 402  392  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 482  392  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 562  392  64  56 -31 -25 normal
-   -1 sprites/tramtracks.png 8bpp 642  392  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 722  392  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp   2  472  64  56 -31 -25 normal
-   -1 sprites/tramtracks.png 8bpp  82  472  64  56 -31 -25 normal
-   -1 sprites/tramtracks.png 8bpp 162  472  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 242  472  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 322  472  64  56 -31 -25 normal
-   -1 sprites/tramtracks.png 8bpp 402  472  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 482  472  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 562  472  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 642  472  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 722  472  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp   2  552  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp  82  552  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 162  552  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 242  552  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 322  552  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 402  552  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 482  552  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 562  552  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 642  552  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 722  552  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp   2  616  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp  82  616  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 162  616  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 242  616  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 322  616  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 402  616  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 482  616  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 562  616  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 642  616  64  56 -31 -25 normal
-   -1 sprites/tramtracks.png 8bpp 722  616  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp   2  696  64  56 -31 -25 normal
-   -1 sprites/tramtracks.png 8bpp  82  696  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 162  696  64  56 -31 -25 normal
-   -1 sprites/tramtracks.png 8bpp 242  696  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 322  696  64  56 -31 -25 normal
-   -1 sprites/tramtracks.png 8bpp 402  696  64  48 -31 -17 normal
-   -1 sprites/tramtracks.png 8bpp 482  696  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 562  696  64  31 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp 642  696  64  39 -31  -8 normal
-   -1 sprites/tramtracks.png 8bpp 722  696  64  23 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp   2  776  64  23 -31   0 normal
-   -1 sprites/tramtracks.png 8bpp  82  776  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 18 8 09 13 20 0 4
+   -1 sprites/tramtracks.png 50 8 09 13 20 0 4
+   -1 sprites/tramtracks.png 82 8 03 36 64 -18 -8
+   -1 sprites/tramtracks.png 162 8 03 36 62 -16 -8
+   -1 sprites/tramtracks.png 242 8 09 31 64 -31 0
+   -1 sprites/tramtracks.png 322 8 09 31 64 -31 0
+   -1 sprites/tramtracks.png 402 8 09 31 64 -31 0
+   -1 sprites/tramtracks.png 482 8 09 31 64 -31 0
+   -1 sprites/tramtracks.png 562 8 09 31 64 -31 0
+   -1 sprites/tramtracks.png 642 8 09 31 64 -31 0
+   -1 sprites/tramtracks.png 722 8 09 31 64 -31 0
+   -1 sprites/tramtracks.png 2 56 09 31 64 -31 0
+   -1 sprites/tramtracks.png 82 56 09 31 64 -31 0
+   -1 sprites/tramtracks.png 162 56 09 31 64 -31 0
+   -1 sprites/tramtracks.png 242 56 09 31 64 -31 0
+   -1 sprites/tramtracks.png 322 56 09 39 64 -31 -8
+   -1 sprites/tramtracks.png 402 56 09 23 64 -31 0
+   -1 sprites/tramtracks.png 482 56 09 23 64 -31 0
+   -1 sprites/tramtracks.png 562 56 09 39 64 -31 -8
+   -1 sprites/tramtracks.png 642 56 09 31 64 -31 0
+   -1 sprites/tramtracks.png 722 56 09 31 64 -31 0
+   -1 sprites/tramtracks.png 2 120 09 31 64 -31 0
+   -1 sprites/tramtracks.png 82 120 09 31 64 -31 0
+   -1 sprites/tramtracks.png 162 120 09 31 64 -31 0
+   -1 sprites/tramtracks.png 242 120 09 31 64 -31 0
+   -1 sprites/tramtracks.png 322 120 09 31 64 -31 0
+   -1 sprites/tramtracks.png 402 120 09 31 64 -31 0
+   -1 sprites/tramtracks.png 482 120 09 31 64 -31 0
+   -1 sprites/tramtracks.png 562 120 09 31 64 -31 0
+   -1 sprites/tramtracks.png 642 120 09 31 64 -31 0
+   -1 sprites/tramtracks.png 722 120 09 31 64 -31 0
+   -1 sprites/tramtracks.png 2 168 09 31 64 -31 0
+   -1 sprites/tramtracks.png 82 168 09 31 64 -31 0
+   -1 sprites/tramtracks.png 162 168 09 31 64 -31 0
+   -1 sprites/tramtracks.png 242 168 09 31 64 -31 0
+   -1 sprites/tramtracks.png 322 168 09 31 64 -31 0
+   -1 sprites/tramtracks.png 402 168 09 31 64 -31 0
+   -1 sprites/tramtracks.png 482 168 09 31 64 -31 0
+   -1 sprites/tramtracks.png 562 168 09 39 64 -31 -8
+   -1 sprites/tramtracks.png 642 168 09 23 64 -31 0
+   -1 sprites/tramtracks.png 722 168 09 23 64 -31 0
+   -1 sprites/tramtracks.png 2 232 09 39 64 -31 -8
+   -1 sprites/tramtracks.png 82 232 09 31 64 -31 0
+   -1 sprites/tramtracks.png 162 232 09 31 64 -31 0
+   -1 sprites/tramtracks.png 242 232 09 31 64 -31 0
+   -1 sprites/tramtracks.png 322 232 09 31 64 -31 0
+   -1 sprites/tramtracks.png 402 232 09 31 64 -31 0
+   -1 sprites/tramtracks.png 482 232 09 31 64 -31 0
+   -1 sprites/tramtracks.png 562 232 09 20 20 0 0
+   -1 sprites/tramtracks.png 594 232 09 31 64 -31 0
+   -1 sprites/tramtracks.png 674 232 09 64 62 2 -49
+   -1 sprites/tramtracks.png 2 312 09 31 64 -31 0
+   -1 sprites/tramtracks.png 82 312 09 64 62 -62 -49
+   -1 sprites/tramtracks.png 162 312 09 64 62 -62 -49
+   -1 sprites/tramtracks.png 242 312 09 64 62 2 -49
+   -1 sprites/tramtracks.png 322 312 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 402 312 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 482 312 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 562 312 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 642 312 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 722 312 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 2 392 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 82 392 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 162 392 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 242 392 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 322 392 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 402 392 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 482 392 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 562 392 09 56 64 -31 -25
+   -1 sprites/tramtracks.png 642 392 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 722 392 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 2 472 09 56 64 -31 -25
+   -1 sprites/tramtracks.png 82 472 09 56 64 -31 -25
+   -1 sprites/tramtracks.png 162 472 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 242 472 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 322 472 09 56 64 -31 -25
+   -1 sprites/tramtracks.png 402 472 09 31 64 -31 0
+   -1 sprites/tramtracks.png 482 472 09 31 64 -31 0
+   -1 sprites/tramtracks.png 562 472 09 31 64 -31 0
+   -1 sprites/tramtracks.png 642 472 09 31 64 -31 0
+   -1 sprites/tramtracks.png 722 472 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 2 552 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 82 552 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 162 552 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 242 552 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 322 552 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 402 552 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 482 552 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 562 552 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 642 552 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 722 552 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 2 616 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 82 616 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 162 616 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 242 616 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 322 616 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 402 616 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 482 616 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 562 616 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 642 616 09 56 64 -31 -25
+   -1 sprites/tramtracks.png 722 616 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 2 696 09 56 64 -31 -25
+   -1 sprites/tramtracks.png 82 696 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 162 696 09 56 64 -31 -25
+   -1 sprites/tramtracks.png 242 696 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 322 696 09 56 64 -31 -25
+   -1 sprites/tramtracks.png 402 696 09 48 64 -31 -17
+   -1 sprites/tramtracks.png 482 696 09 31 64 -31 0
+   -1 sprites/tramtracks.png 562 696 09 31 64 -31 0
+   -1 sprites/tramtracks.png 642 696 09 39 64 -31 -8
+   -1 sprites/tramtracks.png 722 696 09 23 64 -31 0
+   -1 sprites/tramtracks.png 2 776 09 23 64 -31 0
+   -1 sprites/tramtracks.png 82 776 09 39 64 -31 -8
--- a/media/extra_grf/tunnel_portals.nfo
+++ b/media/extra_grf/tunnel_portals.nfo
@@ -1,74 +0,0 @@
-//
-// $Id$
-//
-// This file is part of OpenTTD.
-// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-
-   -1 * 63	 0C "Tunnel portal overlays for railtypes by Snail (Jacopo Coletto)"
-
-// Tropical sprites.
-   -1 * 6	 07 83 01 \7! 02 11
-   -1 * 3	 05 17 10
-   -1 sprites/tunnel_portals.png 8bpp   5   88  35  33 -31  -2 normal
-   -1 sprites/tunnel_portals.png 8bpp  43   88  40  37  -7 -38 normal
-   -1 sprites/tunnel_portals.png 8bpp  86   88  35  21 -31   0 normal
-   -1 sprites/tunnel_portals.png 8bpp 124   88  40  22  -7 -29 normal
-   -1 sprites/tunnel_portals.png 8bpp 168   88  35  21  -2   0 normal
-   -1 sprites/tunnel_portals.png 8bpp 206   88  40  22 -31 -29 normal
-   -1 sprites/tunnel_portals.png 8bpp 249   88  35  33  -2  -2 normal
-   -1 sprites/tunnel_portals.png 8bpp 287   88  40  37 -31 -38 normal
-   -1 sprites/tunnel_portals.png 8bpp   5  170  35  33 -31  -2 normal
-   -1 sprites/tunnel_portals.png 8bpp  43  170  40  37  -7 -38 normal
-   -1 sprites/tunnel_portals.png 8bpp  86  170  35  21 -31   0 normal
-   -1 sprites/tunnel_portals.png 8bpp 124  170  40  22  -7 -29 normal
-   -1 sprites/tunnel_portals.png 8bpp 168  170  35  21  -2   0 normal
-   -1 sprites/tunnel_portals.png 8bpp 206  170  40  22 -31 -29 normal
-   -1 sprites/tunnel_portals.png 8bpp 249  170  35  33  -2  -2 normal
-   -1 sprites/tunnel_portals.png 8bpp 287  170  40  37 -31 -38 normal
-
-// Temperate grass + snow sprites.
-   -1 * 6	 07 83 01 \7= 02 25
-   -1 * 3	 05 17 10
-   -1 sprites/tunnel_portals.png 8bpp   5    6  35  33 -31  -2 normal
-   -1 sprites/tunnel_portals.png 8bpp  43    6  40  37  -7 -38 normal
-   -1 sprites/tunnel_portals.png 8bpp  86    6  35  21 -31   0 normal
-   -1 sprites/tunnel_portals.png 8bpp 124    6  40  22  -7 -29 normal
-   -1 sprites/tunnel_portals.png 8bpp 168    6  35  21  -2   0 normal
-   -1 sprites/tunnel_portals.png 8bpp 206    6  40  22 -31 -29 normal
-   -1 sprites/tunnel_portals.png 8bpp 249    6  35  33  -2  -2 normal
-   -1 sprites/tunnel_portals.png 8bpp 287    6  40  37 -31 -38 normal
-   -1 sprites/tunnel_portals.png 8bpp   5  129  35  33 -31  -2 normal
-   -1 sprites/tunnel_portals.png 8bpp  43  129  40  37  -7 -38 normal
-   -1 sprites/tunnel_portals.png 8bpp  86  129  35  21 -31   0 normal
-   -1 sprites/tunnel_portals.png 8bpp 124  129  40  22  -7 -29 normal
-   -1 sprites/tunnel_portals.png 8bpp 168  129  35  21  -2   0 normal
-   -1 sprites/tunnel_portals.png 8bpp 206  129  40  22 -31 -29 normal
-   -1 sprites/tunnel_portals.png 8bpp 249  129  35  33  -2  -2 normal
-   -1 sprites/tunnel_portals.png 8bpp 287  129  40  37 -31 -38 normal
-
-// Arctic grass sprites.
-   -1 * 6	 07 83 01 \7! 01 09
-   -1 * 4	 05 97 08 00
-   -1 sprites/tunnel_portals.png 8bpp   5   47  35  33 -31  -2 normal
-   -1 sprites/tunnel_portals.png 8bpp  43   47  40  37  -7 -38 normal
-   -1 sprites/tunnel_portals.png 8bpp  86   47  35  21 -31   0 normal
-   -1 sprites/tunnel_portals.png 8bpp 124   47  40  22  -7 -29 normal
-   -1 sprites/tunnel_portals.png 8bpp 168   47  35  21  -2   0 normal
-   -1 sprites/tunnel_portals.png 8bpp 206   47  40  22 -31 -29 normal
-   -1 sprites/tunnel_portals.png 8bpp 249   47  35  33  -2  -2 normal
-   -1 sprites/tunnel_portals.png 8bpp 287   47  40  37 -31 -38 normal
-
-// Toyland sprites.
-   -1 * 6	 07 83 01 \7! 03 09
-   -1 * 4	 05 97 08 00
-   -1 sprites/tunnel_portals.png 8bpp   5  211  35  33 -31  -2 normal
-   -1 sprites/tunnel_portals.png 8bpp  43  211  40  37  -7 -38 normal
-   -1 sprites/tunnel_portals.png 8bpp  86  211  35  21 -31   0 normal
-   -1 sprites/tunnel_portals.png 8bpp 124  211  40  22  -7 -29 normal
-   -1 sprites/tunnel_portals.png 8bpp 168  211  35  21  -2   0 normal
-   -1 sprites/tunnel_portals.png 8bpp 206  211  40  22 -31 -29 normal
-   -1 sprites/tunnel_portals.png 8bpp 249  211  35  33  -2  -2 normal
-   -1 sprites/tunnel_portals.png 8bpp 287  211  40  37 -31 -38 normal
--- a/media/extra_grf/tunnel_portals.png
+++ b/media/extra_grf/tunnel_portals.png
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,50 +1,8 @@
-openttd (1.2.0~RC4) unstable; urgency=low
-
-  * New upstream release 1.2.0-RC4
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 01 Apr 2012 00:00:00 +0200
-
-openttd (1.2.0~RC3) unstable; urgency=low
-
-  * New upstream release 1.2.0-RC3
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 18 Mar 2012 18:00:00 +0100
-
-openttd (1.2.0~RC2) unstable; urgency=low
-
-  * New upstream release 1.2.0-RC2
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 04 Mar 2012 18:00:00 +0100
-
-openttd (1.2.0~RC1) unstable; urgency=low
-
-  * New upstream release 1.2.0-RC1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 19 Feb 2012 23:00:00 +0100
-
-openttd (1.2.0~beta4) unstable; urgency=low
-
-  * New upstream release 1.2.0-beta4
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 04 Feb 2012 16:00:00 +0100
-
-openttd (1.2.0~beta3) unstable; urgency=low
-
-  * New upstream release 1.2.0-beta3
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 21 Jan 2012 16:00:00 +0100
-
-openttd (1.2.0~beta2) unstable; urgency=low
-
-  * New upstream release 1.2.0-beta2
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 07 Jan 2012 00:00:00 +0100
-
 openttd (1.2.0~beta1) unstable; urgency=low

  * New upstream release 1.2.0-beta1

- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 24 Dec 2011 00:00:00 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 24 Dec 2011 00:00:00 +0100

 openttd (1.1.4) unstable; urgency=low

--- a/os/os2/installer/make_installer.cmd
+++ b/os/os2/installer/make_installer.cmd
@@ -1,9 +1,9 @@
@echo off

-set OPENTTD_VERSION=1.2.0-RC4
+set OPENTTD_VERSION=1.2.0-beta1
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
-set OPENGFX_VERSION=1.2.0
+set OPENGFX_VERSION=0.7.0

 echo To make the installer, you must have the WarpIN compiler (wic) installed and in
 echo your path, as well as wget and unzip. This file will download the various DLLs
--- a/os/rpm/openttd.spec
+++ b/os/rpm/openttd.spec
@@ -1,58 +1,40 @@
-#
-# spec file for package openttd
-#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2007-2012 The OpenTTD developers
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
+%define dedicated       0

-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
+%define binname         openttd

-Name:           openttd
-Version:        1.2.beta4
-Release:        0
-%define srcver  1.2.0-beta4
-Summary:        An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe
-License:        GPL-2.0
-Group:          Amusements/Games/Strategy/Other
-Url:            http://www.openttd.org
+%define srcver          1.2.0

-Source:         http://binaries.openttd.org/releases/%{srcver}/%{name}-%{srcver}-source.tar.gz
-
-%if 0%{?suse_version} || 0%{?mdkversion}
-Recommends:     %{name}-gui
+%if %{dedicated}
+Name:           %{binname}-dedicated
+%else
+Name:           %{binname}
 %endif
+Version:        %{srcver}
+Release:        1%{?dist}
+Group:          Amusements/Games/Strategy/Other
+License:        GPLv2
+URL:            http://www.openttd.org
+Summary:        An open source clone of Chris Sawyer's Transport Tycoon Deluxe
+
+Source:         openttd%{?branch:-%{branch}}-%{srcver}-source.tar.bz2
+
+# the main package works with the exact same data package version only
+Requires:       %{binname}-data = %{version}

 BuildRequires:  gcc-c++
 BuildRequires:  libpng-devel
 BuildRequires:  zlib-devel

-%if 0%{?suse_version} || 0%{?mdkversion}
-BuildRequires:  update-alternatives
-Requires:       update-alternatives
-%else
-BuildRequires:  chkconfig
-Requires:       chkconfig
-%endif
-
 %if 0%{?mdkversion}
-BuildRequires:  liblzma-devel
 BuildRequires:  liblzo-devel
+BuildRequires:  liblzma-devel
 %else
 BuildRequires:  lzo-devel
 BuildRequires:  xz-devel
 %endif

-# OBS workaround: needed by libdrm
-%if 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
+#needed by libdrm
+%if 0%{?rhel_version} >= 600
 BuildRequires:  kernel
 %endif

@@ -61,18 +43,44 @@ BuildRequires:  kernel
 BuildRequires:  pkg-config
 %endif

-# bulding openttd.grf is not required as it is a) part of source and
-# b) required only, if you want to use the original set
-%if 0%{?with_grfcodec}
+# Desktop specific tags, not needed for dedicated
+%if !%{dedicated}
+BuildRequires:  fontconfig-devel
+BuildRequires:  SDL-devel
+
 BuildRequires:  grfcodec
+
+# vendor specific dependencies
+ %if !0%{?rhel_version}
+BuildRequires:  libicu-devel
+ %endif
+ %if 0%{?rhel_version} || 0%{?fedora}
+BuildRequires:  freetype-devel
+ %endif
+ %if 0%{?suse_version} || 0%{?mdkversion}
+BuildRequires:  freetype2-devel
+ %endif
+ %if 0%{?suse_version}
+BuildRequires:  update-desktop-files
+ %endif
+%endif
+
+%if %{dedicated}
+Conflicts:      %{binname} %{binname}-gui
+%else
+Provides:       %{binname}-gui
+Conflicts:      %{binname}-dedicated
+Requires:       openttd-opensfx
+# recommends works for suse (not sles9) and mandriva, only
+ %if 0%{?suse_version} || 0%{?mdkversion}
+# require timidity is part of openmsx
+Recommends:     openttd-openmsx
+ %endif
 %endif
 # Recommends would fit better but not well supported...
-Requires:       openttd-opengfx >= 0.4.2
+Requires:       openttd-opengfx >= 0.3.2

-Obsoletes:      %{name}-data < %{version}
-Provides:       %{name}-data = %{version}
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

 %description
 OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
@@ -84,161 +92,70 @@ OpenTTD is licensed under the GNU General Public License version 2.0. For more
 information, see the file 'COPYING' included with every release and source
 download of the game.

-%package gui
-Summary:        OpenTTD GUI/Client (requires SDL)
+# the subpackage data needs only to build once, the dedicated version
+# can reuse the data package of the gui package
+%if !%{dedicated}
+%package data
+Summary:        Data package for OpenTTD
 Group:          Amusements/Games/Strategy/Other
+ %if 0%{?suse_version} >= 1120 || 0%{?fedora} || 0%{?mdkversion}
+BuildArch:      noarch
+ %endif
+BuildRequires:  grfcodec

-Requires:       %{name}
-Conflicts:      %{name}-dedicated
-
-BuildRequires:  SDL-devel
-BuildRequires:  fontconfig-devel
-
-%if 0%{?rhel_version} != 600
-BuildRequires:  libicu-devel
-%endif
-%if 0%{?rhel_version} || 0%{?fedora}
-BuildRequires:  freetype-devel
-%endif
-%if 0%{?suse_version} || 0%{?mdkversion}
-BuildRequires:  freetype2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:  update-desktop-files
-%else
-BuildRequires:  desktop-file-utils
-Requires:       hicolor-icon-theme
-%endif
-
-%if 0%{?suse_version} || 0%{?mdkversion}
-Recommends:     openttd-openmsx
-Recommends:     openttd-opensfx
-%endif
-
-%description gui
-OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
-with lots of new features and enhancements. To play the game you need either
-the original data from the game or install the recommend subackages OpenGFX for
-free graphics, OpenSFX for free sounds and OpenMSX for free music.
-
-This subpackage provides the binary which needs SDL.
-
-%package dedicated
-Summary:        OpenTTD Dedicated Server binary (without SDL)
-Group:          Amusements/Games/Strategy/Other
-
-Requires:       %{name}
-Conflicts:      %{name}-gui
-
-%description dedicated
+%description data
 OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
 with lots of new features and enhancements. To play the game you need either
 the original data from the game or the required package OpenGFX and OpenSFX.

-This subpackage provides the binary without dependency of SDL.
+This package is required by openttd gui and openttd dedicated package. This
+way it is possible to install a openttd version without SDL requirement.
+
+%endif

 %prep
 %setup -qn openttd%{?branch:-%{branch}}-%{srcver}

 # we build the grfs from sources but validate the result with the existing data
-%if 0%{?with_grfcodec}
-md5sum bin/data/* > validate.data
-%endif
+md5sum bin/baseset/* > validate.data

 %build
-# first, we build the dedicated binary and copy it to dedicated/
 ./configure \
        --prefix-dir="%{_prefix}" \
+        --binary-name="%{binname}" \
        --binary-dir="bin" \
-        --data-dir="share/%{name}" \
-        --enable-dedicated
-make %{?_smp_mflags} BUNDLE_DIR="dedicated" bundle
-
-# then, we build the common gui version which we install the usual way
-./configure \
-        --prefix-dir="%{_prefix}" \
-        --binary-name="%{name}" \
-        --binary-dir="bin" \
-        --data-dir="share/%{name}" \
-        --doc-dir="share/doc/%{name}" \
+        --data-dir="share/%{binname}" \
+        --doc-dir="share/doc/%{binname}" \
        --menu-name="OpenTTD%{?branch: %{branch}}" \
-        --menu-group="Game;StrategyGame;"
+        --menu-group="Game;StrategyGame;" \
+        --enable-dedicated="%{dedicated}" \

 make %{?_smp_mflags}

 %install
-# install the dedicated binary
-install -D -m0755 dedicated/openttd %{buildroot}%{_bindir}/%{name}-dedicated
-# install the gui binary and rename to openttd-gui
-make install INSTALL_DIR=%{buildroot}
-mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-gui
-# we need a dummy target for /etc/alternatives/openttd
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-touch %{buildroot}%{_sysconfdir}/alternatives/%{name}
-ln -s -f /etc/alternatives/%{name} %{buildroot}%{_bindir}/%{name}
-
-%if 0%{?suse_version}
-%suse_update_desktop_file -r %{name} Game StrategyGame
+%if %{dedicated}
+# dedicated package needs binary only
+install -D -m0755 bin/openttd %{buildroot}/%{_bindir}/%{binname}
 %else
-%if 0%{?fedora} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
-        --add-category=StrategyGame \
-        media/openttd.desktop
-%endif
+make install INSTALL_DIR="%{buildroot}"
+ %if 0%{?suse_version}
+%suse_update_desktop_file -r %{binname} Game StrategyGame
+ %endif
 %endif

-%if 0%{?with_grfcodec}
+%clean
+rm -rf "%{buildroot}"
+
 %check
 md5sum -c validate.data
-%endif

-%post gui
-/usr/sbin/update-alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-gui 10
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%post dedicated
-/usr/sbin/update-alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-dedicated 0
-
-%preun gui
-if [ "$1" = 0 ] ; then
-    /usr/sbin/update-alternatives --remove %{name} %{_bindir}/%{name}-gui
-fi
-
-%preun dedicated
-if [ "$1" = 0 ] ; then
-    /usr/sbin/update-alternatives --remove %{name} %{_bindir}/%{name}-dedicated
-fi
-
-%postun gui
-if [ "$1" -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans gui
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-# we need a file in the main package so it will be made
 %files
-%defattr(-, root, root)
-%dir %{_datadir}/doc/%{name}
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/lang
-%dir %{_datadir}/%{name}/baseset
-%dir %{_datadir}/%{name}/scripts
-%dir %{_datadir}/%{name}/ai
-%{_datadir}/doc/%{name}/*
-%{_datadir}/%{name}/lang/*
-%{_datadir}/%{name}/baseset/*
-%{_datadir}/%{name}/scripts/*
-%{_datadir}/%{name}/ai/*
-%doc %{_mandir}/man6/%{name}.6.*
+%attr(755, root, root) %{_bindir}/%{binname}

-%files gui
+# all other files are for the gui version only, also no
+# subpackage needed for the dedicated version
+%if !%{dedicated}
 %defattr(-, root, root)
-%ghost %{_sysconfdir}/alternatives/%{name}
-%ghost %{_bindir}/%{name}
-%{_bindir}/%{name}-gui
 %dir %{_datadir}/icons/hicolor
 %dir %{_datadir}/icons/hicolor/16x16
 %dir %{_datadir}/icons/hicolor/16x16/apps
@@ -252,19 +169,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{_datadir}/icons/hicolor/128x128/apps
 %dir %{_datadir}/icons/hicolor/256x256
 %dir %{_datadir}/icons/hicolor/256x256/apps
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
-%{_datadir}/pixmaps/%{name}.32.xpm
+%{_datadir}/applications/%{binname}.desktop
+%{_datadir}/icons/hicolor/16x16/apps/%{binname}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{binname}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{binname}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{binname}.png
+%{_datadir}/icons/hicolor/128x128/apps/%{binname}.png
+%{_datadir}/icons/hicolor/256x256/apps/%{binname}.png
+%{_datadir}/pixmaps/%{binname}.32.xpm

-%files dedicated
+%files data
 %defattr(-, root, root)
-%ghost %{_bindir}/%{name}
-%ghost %{_sysconfdir}/alternatives/%{name}
-%{_bindir}/%{name}-dedicated
+%dir %{_datadir}/doc/%{binname}
+%dir %{_datadir}/%{binname}
+%dir %{_datadir}/%{binname}/lang
+%dir %{_datadir}/%{binname}/baseset
+%dir %{_datadir}/%{binname}/scripts
+%dir %{_datadir}/%{binname}/ai
+%{_datadir}/doc/%{binname}/*
+%{_datadir}/%{binname}/lang/*
+%{_datadir}/%{binname}/baseset/*
+%{_datadir}/%{binname}/scripts/*
+%{_datadir}/%{binname}/ai/*
+%doc %{_mandir}/man6/%{binname}.6.*
+%endif

 %changelog
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -2,8 +2,8 @@
 !define APPV_MAJOR 1
 !define APPV_MINOR 2
 !define APPV_MAINT 0
-!define APPV_BUILD 7
-!define APPV_EXTRA "-RC4"
+!define APPV_BUILD 0
+!define APPV_EXTRA "-beta1"

 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
@@ -14,7 +14,7 @@
 !define APPURLLINK "http://www.openttd.org"
 !define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"

-!define OPENGFX_BASE_VERSION "1.2.0"
+!define OPENGFX_BASE_VERSION "0.7.0"
 !define OPENSFX_BASE_VERSION "0.8.0"
 !define OPENMSX_BASE_VERSION "1.0.0"

@@ -281,17 +281,17 @@ SectionEnd
 Section "Download OpenMSX (free music set)" Section5
 	SetOverwrite try

-	NSISdl::download "http://binaries.openttd.org/installer/openmsx-${OPENMSX_BASE_VERSION}.7z" "$INSTDIR\baseset\openmsx.7z"
+	NSISdl::download "http://binaries.openttd.org/installer/openmsx-${OPENMSX_BASE_VERSION}.7z" "$INSTDIR\gm\openmsx.7z"
 	Pop $R0 ;Get the return value
 	StrCmp $R0 "success" +3
 		MessageBox MB_OK "Downloading of OpenMSX failed"
 		Goto Done

 	; Let's extract the files
-	SetOutPath "$INSTDIR\baseset\"
-	NSIS7z::Extract "$INSTDIR\baseset\openmsx.7z"
+	SetOutPath "$INSTDIR\gm\"
+	NSIS7z::Extract "$INSTDIR\gm\openmsx.7z"

-	Delete "$INSTDIR\baseset\openmsx.7z"
+	Delete "$INSTDIR\gm\openmsx.7z"
 	SetOutPath "$INSTDIR\"
 Done:

--- a/projects/langs_vs100.vcxproj
+++ b/projects/langs_vs100.vcxproj
@@ -107,12 +107,6 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\dutch.lng;%(Outputs)</Outputs>
    </CustomBuild>
-    <CustomBuild Include="..\src\lang\english_AU.txt">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english_AU language file</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\english_AU.lng;%(Outputs)</Outputs>
-    </CustomBuild>
    <CustomBuild Include="..\src\lang\english_US.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english_US language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
--- a/projects/langs_vs100.vcxproj.filters
+++ b/projects/langs_vs100.vcxproj.filters
@@ -37,9 +37,6 @@
    <CustomBuild Include="..\src\lang\dutch.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
-    <CustomBuild Include="..\src\lang\english_AU.txt">
-      <Filter>Translations</Filter>
-    </CustomBuild>
    <CustomBuild Include="..\src\lang\english_US.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
--- a/projects/langs_vs80.vcproj
+++ b/projects/langs_vs80.vcproj
@@ -213,21 +213,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\english_AU.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating english_AU language file"
-						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
-						Outputs="..\bin\lang\english_AU.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\english_US.txt"
 				>
--- a/projects/langs_vs90.vcproj
+++ b/projects/langs_vs90.vcproj
@@ -214,21 +214,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\src\lang\english_AU.txt"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating english_AU language file"
-						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
-						Outputs="..\bin\lang\english_AU.lng"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\lang\english_US.txt"
 				>
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -573,8 +573,6 @@
    <ClInclude Include="..\src\terraform_gui.h" />
    <ClInclude Include="..\src\textbuf_gui.h" />
    <ClInclude Include="..\src\texteff.hpp" />
-    <ClInclude Include="..\src\textfile_gui.h" />
-    <ClInclude Include="..\src\textfile_type.h" />
    <ClInclude Include="..\src\tgp.h" />
    <ClInclude Include="..\src\tile_cmd.h" />
    <ClInclude Include="..\src\tile_type.h" />
@@ -686,7 +684,6 @@
    <ClCompile Include="..\src\statusbar_gui.cpp" />
    <ClCompile Include="..\src\subsidy_gui.cpp" />
    <ClCompile Include="..\src\terraform_gui.cpp" />
-    <ClCompile Include="..\src\textfile_gui.cpp" />
    <ClCompile Include="..\src\timetable_gui.cpp" />
    <ClCompile Include="..\src\toolbar_gui.cpp" />
    <ClCompile Include="..\src\town_gui.cpp" />
@@ -1082,6 +1079,8 @@
    <ClInclude Include="..\src\video\video_driver.hpp" />
    <ClCompile Include="..\src\spriteloader\grf.cpp" />
    <ClInclude Include="..\src\spriteloader\grf.hpp" />
+    <ClCompile Include="..\src\spriteloader\png.cpp" />
+    <ClInclude Include="..\src\spriteloader\png.hpp" />
    <ClInclude Include="..\src\spriteloader\spriteloader.hpp" />
    <ClCompile Include="..\src\newgrf.cpp" />
    <ClCompile Include="..\src\newgrf_airport.cpp" />
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -948,12 +948,6 @@
    <ClInclude Include="..\src\texteff.hpp">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\textfile_gui.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\textfile_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\tgp.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1287,9 +1281,6 @@
    <ClCompile Include="..\src\terraform_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\textfile_gui.cpp">
-      <Filter>GUI Source Code</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\timetable_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
@@ -2475,6 +2466,12 @@
    <ClInclude Include="..\src\spriteloader\grf.hpp">
      <Filter>Sprite loaders</Filter>
    </ClInclude>
+    <ClCompile Include="..\src\spriteloader\png.cpp">
+      <Filter>Sprite loaders</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\spriteloader\png.hpp">
+      <Filter>Sprite loaders</Filter>
+    </ClInclude>
    <ClInclude Include="..\src\spriteloader\spriteloader.hpp">
      <Filter>Sprite loaders</Filter>
    </ClInclude>
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -1566,14 +1566,6 @@
 				RelativePath=".\..\src\texteff.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textfile_gui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\textfile_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\tgp.h"
 				>
@@ -2026,10 +2018,6 @@
 				RelativePath=".\..\src\terraform_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textfile_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\timetable_gui.cpp"
 				>
@@ -3678,6 +3666,14 @@
 				RelativePath=".\..\src\spriteloader\grf.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\spriteloader\png.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\spriteloader\png.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\spriteloader\spriteloader.hpp"
 				>
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -1563,14 +1563,6 @@
 				RelativePath=".\..\src\texteff.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textfile_gui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\textfile_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\tgp.h"
 				>
@@ -2023,10 +2015,6 @@
 				RelativePath=".\..\src\terraform_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textfile_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\timetable_gui.cpp"
 				>
@@ -3675,6 +3663,14 @@
 				RelativePath=".\..\src\spriteloader\grf.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\spriteloader\png.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\spriteloader\png.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\spriteloader\spriteloader.hpp"
 				>
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD readme
-Last updated:    2012-04-01
-Release version: 1.2.0-RC4
+Last updated:    2011-12-24
+Release version: 1.2.0-beta1
 ------------------------------------------------------------------------


@@ -262,7 +262,7 @@ system:
 		directory if it is your personal directory, i.e. "~/", or when it is the
 		root directory, i.e. "/".
 	2. Your personal directory
-		Windows: C:\My Documents\OpenTTD (95, 98, ME)
+		Windows: C:\My Documents (95, 98, ME)
 		         C:\Documents and Settings\<username>\My Documents\OpenTTD (2000, XP)
 		         C:\Users\<username>\Documents\OpenTTD (Vista, 7)
 		Mac OSX: ~/Documents/OpenTTD
@@ -292,8 +292,6 @@ OpenTTD directory:
 	Music Sets:          baseset                 (or a subdirectory thereof)
 	AIs:                 ai                      (or a subdirectory thereof)
 	AI Libraries:        ai/libraries            (or a subdirectory thereof)
-	Game Scripts (GS):   game                    (or a subdirectory thereof)
-	GS Libraries:        game/libraries          (or a subdirectory thereof)
 	Savegames:           save
 	Automatic Savegames: save/autosave
 	Scenarios:           scenario
@@ -501,8 +499,6 @@ The following compilers are known to compile OpenTTD:
    Versions 4.4 - 4.6 give bogus warnings about freeing non-heap objects.
    Versions 4.5 and later give invalid warnings when lto is enabled.
  - Intel C++ Compiler (ICC) 12.0.
-  - Clang/LLVM 2.9 - 3.0
-    Version 2.9 gives bogus warnings about code nonconformity.

 The following compilers are known not to compile OpenTTD:
  - Microsoft Visual C++ (MSVC) 2003 and earlier.
@@ -512,7 +508,7 @@ The following compilers are known not to compile OpenTTD:
    Version 10.0 and earlier fail a configure check and fail with recent system
        headers.
    Version 10.1 fails to compile station_gui.cpp.
-    Version 11.1 fails with an internal error when compiling network.cpp.
+    Version 11.1 fails with internal error when compiling network.cpp.
  - Clang/LLVM 2.8 and earlier.
  - (Open) Watcom.

@@ -649,7 +645,7 @@ Retired Developers:
  Serge Paquet (vurlix)           - Assistant project manager, coder (0.1 - 0.3.3)
  Dominik Scherer (dominik81)     - Lead programmer, GUI expert (0.3.0 - 0.3.6)
  Benedikt Brüggemeier (skidd13)  - Bug fixer and code reworker
-  Patric Stout (TrueBrain)        - NoProgrammer (0.3 - 1.2), sys op (active)
+  Patric Stout (TrueBrain)        - Programmer (0.3 - pre0.7), sys op (active)

 Thanks to:
  Josef Drexler                   - For his great work on TTDPatch.
@@ -667,8 +663,6 @@ Thanks to:
  George                          - Canal graphics
  Andrew Parkhouse (andythenorth) - River graphics
  David Dallaston (Pikka)         - Tram tracks
-  Marcin Grzegorczyk              - Foundations for tracks on slopes",
-  Daniel Blödorn (Bluescreen)     - Title game
  All Translators                 - For their support to make OpenTTD a truly international game
  Bug Reporters                   - Thanks for all bug reports
  Chris Sawyer                    - For an amazing game!
--- a/source.list
+++ b/source.list
@@ -306,8 +306,6 @@ tar_type.h
 terraform_gui.h
 textbuf_gui.h
 texteff.hpp
-textfile_gui.h
-textfile_type.h
 tgp.h
 tile_cmd.h
 tile_type.h
@@ -438,7 +436,6 @@ station_gui.cpp
 statusbar_gui.cpp
 subsidy_gui.cpp
 terraform_gui.cpp
-textfile_gui.cpp
 timetable_gui.cpp
 toolbar_gui.cpp
 town_gui.cpp
@@ -871,6 +868,10 @@ video/video_driver.hpp
 # Sprite loaders
 spriteloader/grf.cpp
 spriteloader/grf.hpp
+#if PNG
+spriteloader/png.cpp
+spriteloader/png.hpp
+#end
 spriteloader/spriteloader.hpp

 # NewGRF
--- a/src/3rdparty/squirrel/include/squirrel.h
+++ b/src/3rdparty/squirrel/include/squirrel.h
@@ -183,7 +183,7 @@ typedef char SQChar;
 #define scstrdup	strdup
 #define scstrrchr	strrchr
 #define scstrcat	strcat
-#define MAX_CHAR 0xFFFF
+#define MAX_CHAR 0xFF
 #endif

 #define SQUIRREL_VERSION	_SC("Squirrel 2.2.5 stable - With custom OpenTTD modifications")
--- a/src/3rdparty/squirrel/squirrel/sqbaselib.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqbaselib.cpp
@@ -538,10 +538,6 @@ bool _hsort_sift_down(HSQUIRRELVM v,SQArray *arr, SQInteger root, SQInteger bott
 		if(!_sort_compare(v,arr->_values[root],arr->_values[maxChild],func,ret))
 			return false;
 		if (ret < 0) {
-			if (root == maxChild) {
-				v->Raise_Error(_SC("inconsistent compare function"));
-				return false; // We'd be swapping ourselve. The compare function is incorrect
-			}
 			_Swap(arr->_values[root],arr->_values[maxChild]);
 			root = maxChild;
 		}
--- a/src/3rdparty/squirrel/squirrel/sqlexer.h
+++ b/src/3rdparty/squirrel/squirrel/sqlexer.h
@@ -2,7 +2,11 @@
 #ifndef _SQLEXER_H_
 #define _SQLEXER_H_

-typedef unsigned short LexChar;
+#ifdef SQUNICODE
+typedef SQChar LexChar;
+#else
+typedef	unsigned char LexChar;
+#endif

 struct SQLexer
 {
--- a/src/3rdparty/squirrel/squirrel/sqvm.h
+++ b/src/3rdparty/squirrel/squirrel/sqvm.h
@@ -200,10 +200,6 @@ inline SQObjectPtr &stack_get(HSQUIRRELVM v,SQInteger idx){return ((idx>=0)?(v->

 #define PUSH_CALLINFO(v,nci){ \
 	if(v->_callsstacksize == v->_alloccallsstacksize) { \
-		if (v->_callsstacksize > 65535) {\
-			v->Raise_Error(_SC("stack overflow"));\
-			return false;\
-		}\
 		v->GrowCallStack(); \
 	} \
 	v->ci = &v->_callsstack[v->_callsstacksize]; \
--- a/src/ai/ai.hpp
+++ b/src/ai/ai.hpp
@@ -13,6 +13,7 @@
 #define AI_HPP

 #include "../script/api/script_event_types.hpp"
+#include "../date_type.h"
 #include "../core/string_compare_type.hpp"
 #include <map>

--- a/src/ai/ai_config.cpp
+++ b/src/ai/ai_config.cpp
@@ -11,6 +11,7 @@

 #include "../stdafx.h"
 #include "../settings_type.h"
+#include "../core/random_func.hpp"
 #include "ai.hpp"
 #include "ai_config.hpp"
 #include "ai_info.hpp"
--- a/src/ai/ai_config.hpp
+++ b/src/ai/ai_config.hpp
@@ -13,7 +13,6 @@
 #define AI_CONFIG_HPP

 #include "../script/script_config.hpp"
-#include "../company_type.h"

 class AIConfig : public ScriptConfig {
 public:
--- a/src/ai/ai_core.cpp
+++ b/src/ai/ai_core.cpp
@@ -16,11 +16,15 @@
 #include "../company_func.h"
 #include "../network/network.h"
 #include "../window_func.h"
+#include "../command_func.h"
+#include "../fileio_func.h"
 #include "ai_scanner.hpp"
 #include "ai_instance.hpp"
 #include "ai_config.hpp"
 #include "ai_info.hpp"
 #include "ai.hpp"
+#include "../script/script_storage.hpp"
+#include "../script/api/script_error.hpp"

 /* static */ uint AI::frame_counter = 0;
 /* static */ AIScannerInfo *AI::scanner_info = NULL;
@@ -104,7 +108,6 @@

 	delete c->ai_instance;
 	c->ai_instance = NULL;
-	c->ai_info = NULL;

 	cur_company.Restore();

@@ -330,7 +333,7 @@

 	InvalidateWindowData(WC_AI_LIST, 0, 1);
 	SetWindowClassesDirty(WC_AI_DEBUG);
-	InvalidateWindowClassesData(WC_AI_SETTINGS);
+	SetWindowDirty(WC_AI_SETTINGS, 0);
 }

 #if defined(ENABLE_NETWORK)
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -7,13 +7,14 @@
 * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 */

-/** @file ai_gui.cpp %Window for configuring the AIs */
+/** @file ai_gui.cpp Window for configuring the AIs */

 #include "../stdafx.h"
 #include "../table/sprites.h"
 #include "../error.h"
 #include "../gui.h"
 #include "../querystring_gui.h"
+#include "../company_func.h"
 #include "../company_base.h"
 #include "../company_gui.h"
 #include "../strings_func.h"
@@ -23,7 +24,7 @@
 #include "../network/network.h"
 #include "../settings_func.h"
 #include "../network/network_content.h"
-#include "../textfile_gui.h"
+#include "../core/backup_type.hpp"

 #include "ai.hpp"
 #include "../script/api/script_log.hpp"
@@ -35,6 +36,7 @@
 #include "../game/game_info.hpp"
 #include "../game/game_instance.hpp"

+#include "../widgets/ai_widget.h"

 #include "table/strings.h"

@@ -170,9 +172,7 @@ struct AIListWindow : public Window {
 			for (int i = 0; i < this->selected; i++) it++;
 			GetConfig(slot)->Change((*it).second->GetName(), (*it).second->GetVersion());
 		}
-		InvalidateWindowData(WC_GAME_OPTIONS, WN_GAME_OPTIONS_AI);
-		InvalidateWindowClassesData(WC_AI_SETTINGS);
-		DeleteWindowByClass(WC_QUERY_STRING);
+		SetWindowDirty(WC_GAME_OPTIONS, WN_GAME_OPTIONS_AI);
 	}

 	virtual void OnClick(Point pt, int widget, int click_count)
@@ -385,7 +385,7 @@ struct AISettingsWindow : public Window {
 			}

 			if ((config_item.flags & SCRIPTCONFIG_BOOLEAN) != 0) {
-				DrawBoolButton(buttons_left, y + 2, current_value != 0, editable);
+				DrawFrameRect(buttons_left, y  + 2, buttons_left + 19, y + 10, (current_value != 0) ? COLOUR_GREEN : COLOUR_RED, (current_value != 0) ? FR_LOWERED : FR_NONE);
 				SetDParam(idx++, current_value == 0 ? STR_CONFIG_SETTING_OFF : STR_CONFIG_SETTING_ON);
 			} else {
 				DrawArrowButtons(buttons_left, y + 2, COLOUR_YELLOW, (this->clicked_button == i) ? 1 + (this->clicked_increase != rtl) : 0, editable && current_value > config_item.min_value, editable && current_value < config_item.max_value);
@@ -518,7 +518,11 @@ struct AISettingsWindow : public Window {
 	 */
 	virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
 	{
-		this->RebuildVisibleSettings();
+		if (_game_mode == GM_NORMAL && Company::IsValidID(this->slot)) {
+			delete this;
+		} else {
+			this->RebuildVisibleSettings();
+		}
 	}
 };

@@ -560,40 +564,6 @@ static void ShowAISettingsWindow(CompanyID slot)
 	new AISettingsWindow(&_ai_settings_desc, slot);
 }

-
-/** Window for displaying the textfile of a AI. */
-struct ScriptTextfileWindow : public TextfileWindow {
-	CompanyID slot; ///< View the textfile of this CompanyID slot.
-
-	ScriptTextfileWindow(TextfileType file_type, CompanyID slot) : TextfileWindow(file_type), slot(slot)
-	{
-		this->GetWidget<NWidgetCore>(WID_TF_CAPTION)->SetDataTip(STR_TEXTFILE_README_CAPTION + file_type, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS);
-
-		const char *textfile = GetConfig(slot)->GetTextfile(file_type, slot);
-		this->LoadTextfile(textfile, (slot == OWNER_DEITY) ? GAME_DIR : AI_DIR);
-	}
-
-	/* virtual */ void SetStringParameters(int widget) const
-	{
-		if (widget == WID_TF_CAPTION) {
-			SetDParam(0, (slot == OWNER_DEITY) ? STR_CONTENT_TYPE_GAME_SCRIPT : STR_CONTENT_TYPE_AI);
-			SetDParamStr(1, GetConfig(slot)->GetName());
-		}
-	}
-};
-
-/**
- * Open the AI version of the textfile window.
- * @param file_type The type of textfile to display.
- * @param slot The slot the Script is using.
- */
-void ShowScriptTextfileWindow(TextfileType file_type, CompanyID slot)
-{
-	DeleteWindowByClass(WC_TEXTFILE);
-	new ScriptTextfileWindow(file_type, slot);
-}
-
-
 /** Widgets for the configure AI window. */
 static const NWidgetPart _nested_ai_config_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
@@ -627,11 +597,6 @@ static const NWidgetPart _nested_ai_config_widgets[] = {
 			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CHANGE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CONFIG_CHANGE, STR_AI_CONFIG_CHANGE_TOOLTIP),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CONFIGURE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CONFIG_CONFIGURE, STR_AI_CONFIG_CONFIGURE_TOOLTIP),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CLOSE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_SETTINGS_CLOSE, STR_NULL),
-			EndContainer(),
-		NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(7, 0, 7),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_TEXTFILE + TFT_README), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_README, STR_NULL),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_TEXTFILE + TFT_CHANGELOG), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_CHANGELOG, STR_NULL),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_TEXTFILE + TFT_LICENSE), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_LICENCE, STR_NULL),
 		EndContainer(),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CONTENT_DOWNLOAD), SetFill(1, 0), SetMinimalSize(279, 12), SetPadding(0, 7, 9, 7), SetDataTip(STR_INTRO_ONLINE_CONTENT, STR_INTRO_TOOLTIP_ONLINE_CONTENT),
 	EndContainer(),
@@ -768,13 +733,6 @@ struct AIConfigWindow : public Window {

 	virtual void OnClick(Point pt, int widget, int click_count)
 	{
-		if (widget >= WID_AIC_TEXTFILE && widget < WID_AIC_TEXTFILE + TFT_END) {
-			if (this->selected_slot == INVALID_COMPANY || GetConfig(this->selected_slot) == NULL) return;
-
-			ShowScriptTextfileWindow((TextfileType)(widget - WID_AIC_TEXTFILE), this->selected_slot);
-			return;
-		}
-
 		switch (widget) {
 			case WID_AIC_DECREASE:
 			case WID_AIC_INCREASE: {
@@ -865,10 +823,6 @@ struct AIConfigWindow : public Window {
 		this->SetWidgetDisabledState(WID_AIC_CONFIGURE, this->selected_slot == INVALID_COMPANY || GetConfig(this->selected_slot)->GetConfigList()->size() == 0);
 		this->SetWidgetDisabledState(WID_AIC_MOVE_UP, this->selected_slot == OWNER_DEITY || this->selected_slot == INVALID_COMPANY || !IsEditable((CompanyID)(this->selected_slot - 1)));
 		this->SetWidgetDisabledState(WID_AIC_MOVE_DOWN, this->selected_slot == OWNER_DEITY || this->selected_slot == INVALID_COMPANY || !IsEditable((CompanyID)(this->selected_slot + 1)));
-
-		for (TextfileType tft = TFT_BEGIN; tft < TFT_END; tft++) {
-			this->SetWidgetDisabledState(WID_AIC_TEXTFILE + tft, this->selected_slot == INVALID_COMPANY || (GetConfig(this->selected_slot)->GetTextfile(tft, this->selected_slot) == NULL));
-		}
 	}
 };

@@ -1365,9 +1319,4 @@ void ShowAIDebugWindowIfAIError()
 			break;
 		}
 	}
-
-	GameInstance *g = Game::GetGameInstance();
-	if (g != NULL && g->IsDead()) {
-		ShowAIDebugWindow(OWNER_DEITY);
-	}
 }
--- a/src/ai/ai_gui.hpp
+++ b/src/ai/ai_gui.hpp
@@ -7,7 +7,7 @@
 * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 */

-/** @file ai_gui.hpp %Window for configuring the AIs  */
+/** @file ai_gui.hpp Window for configuring the AIs  */

 #ifndef AI_GUI_HPP
 #define AI_GUI_HPP
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -11,11 +11,14 @@

 #include "../stdafx.h"

+#include "../script/squirrel_helper.hpp"
 #include "../script/squirrel_class.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
+#include "../settings_type.h"
 #include "../debug.h"
 #include "../rev.h"
+#include "ai.hpp"

 /**
 * Check if the API version provided by the AI is supported.
--- a/src/ai/ai_info.hpp
+++ b/src/ai/ai_info.hpp
@@ -13,6 +13,7 @@
 #define AI_INFO_HPP

 #include "../script/script_info.hpp"
+#include "../script/script_config.hpp"

 /** All static information from an AI like name, version, etc. */
 class AIInfo : public ScriptInfo {
--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -11,6 +11,7 @@

 #include "../stdafx.h"
 #include "../debug.h"
+#include "../saveload/saveload.h"
 #include "../error.h"

 #include "../script/squirrel_class.hpp"
@@ -19,6 +20,8 @@
 #include "ai_gui.hpp"
 #include "ai.hpp"

+#include "../script/script_fatalerror.hpp"
+#include "../script/script_suspend.hpp"
 #include "../script/script_storage.hpp"
 #include "ai_info.hpp"
 #include "ai_instance.hpp"
--- a/src/ai/ai_instance.hpp
+++ b/src/ai/ai_instance.hpp
@@ -12,6 +12,7 @@
 #ifndef AI_INSTANCE_HPP
 #define AI_INSTANCE_HPP

+#include <squirrel.h>
 #include "../script/script_instance.hpp"

 /** Runtime information about an AI like a pointer to the squirrel vm and the current state. */
--- a/src/ai/ai_scanner.cpp
+++ b/src/ai/ai_scanner.cpp
@@ -11,12 +11,14 @@

 #include "../stdafx.h"
 #include "../debug.h"
+#include "../fileio_func.h"
 #include "../network/network.h"
 #include "../core/random_func.hpp"

 #include "../script/squirrel_class.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
+#include "../script/api/script_controller.hpp"


 AIScannerInfo::AIScannerInfo() :
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -16,6 +16,7 @@
 #include "aircraft.h"
 #include "landscape.h"
 #include "news_func.h"
+#include "vehicle_gui.h"
 #include "newgrf_engine.h"
 #include "newgrf_sound.h"
 #include "spritecache.h"
@@ -313,8 +314,8 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, const Engine *

 		UpdateAircraftCache(v, true);

-		VehicleUpdatePosition(v);
-		VehicleUpdatePosition(u);
+		VehicleMove(v, false);
+		VehicleMove(u, false);

 		/* Aircraft with 3 vehicles (chopper)? */
 		if (v->subtype == AIR_HELICOPTER) {
@@ -335,7 +336,7 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, const Engine *
 			w->UpdateDeltaXY(INVALID_DIR);

 			u->SetNext(w);
-			VehicleUpdatePosition(w);
+			VehicleMove(w, false);
 		}
 	}

@@ -463,7 +464,7 @@ static void HelicopterTickHandler(Aircraft *v)

 	u->cur_image = img;

-	VehicleUpdatePositionAndViewport(u);
+	VehicleMove(u, true);
 }

 /**
@@ -479,7 +480,6 @@ void SetAircraftPosition(Aircraft *v, int x, int y, int z)
 	v->y_pos = y;
 	v->z_pos = z;

-	VehicleUpdatePosition(v);
 	v->UpdateViewport(true, false);
 	if (v->subtype == AIR_HELICOPTER) v->Next()->Next()->cur_image = GetRotorImage(v, EIT_ON_MAP);

@@ -494,7 +494,7 @@ void SetAircraftPosition(Aircraft *v, int x, int y, int z)
 	u->z_pos = GetSlopePixelZ(safe_x, safe_y);
 	u->cur_image = v->cur_image;

-	VehicleUpdatePositionAndViewport(u);
+	VehicleMove(u, true);

 	u = u->Next();
 	if (u != NULL) {
@@ -502,7 +502,7 @@ void SetAircraftPosition(Aircraft *v, int x, int y, int z)
 		u->y_pos = y;
 		u->z_pos = z + ROTOR_Z_OFFSET;

-		VehicleUpdatePositionAndViewport(u);
+		VehicleMove(u, true);
 	}
 }

@@ -1894,7 +1894,7 @@ static bool AircraftEventHandler(Aircraft *v, int loop)

 	if (v->current_order.IsType(OT_LOADING) || v->current_order.IsType(OT_LEAVESTATION)) return true;

-	if (v->state >= ENDTAKEOFF && v->state <= HELIENDLANDING) {
+	if (v->state == FLYING) {
 		/* If we are flying, unconditionally clear the 'dest too far' state. */
 		AircraftHandleDestTooFar(v, false);
 	} else if (v->acache.cached_max_range_sqr != 0) {
--- a/src/airport.cpp
+++ b/src/airport.cpp
@@ -201,7 +201,7 @@ static AirportFTA *AirportBuildAutomata(uint nofelements, const AirportFTAbuildu

 /**
 * Get the finite state machine of an airport type.
- * @param airport_type %Airport type to query FTA from. @see AirportTypes
+ * @param airport_type Airport type to query FTA from. @see AirportTypes
 * @return Finite state machine of the airport.
 */
 const AirportFTAClass *GetAirport(const byte airport_type)
--- a/src/airport.h
+++ b/src/airport.h
@@ -71,7 +71,7 @@ enum AirportMovementStates {
 	STARTTAKEOFF   = 11, ///< Airplane has arrived at a runway for take-off.
 	ENDTAKEOFF     = 12, ///< Airplane has reached end-point of the take-off runway.
 	HELITAKEOFF    = 13, ///< Helicopter wants to leave the airport.
-	FLYING         = 14, ///< %Vehicle is flying in the air.
+	FLYING         = 14, ///< Vehicle is flying in the air.
 	LANDING        = 15, ///< Airplane wants to land.
 	ENDLANDING     = 16, ///< Airplane wants to finish landing.
 	HELILANDING    = 17, ///< Helicopter wants to land.
@@ -172,7 +172,7 @@ public:

 	const AirportMovingData *moving_data; ///< Movement data.
 	struct AirportFTA *layout;            ///< state machine for airport
-	const byte *terminals;                ///< %Array with the number of terminal groups, followed by the number of terminals in each group.
+	const byte *terminals;                ///< Array with the number of terminal groups, followed by the number of terminals in each group.
 	const byte num_helipads;              ///< Number of helipads on this airport. When 0 helicopters will go to normal terminals.
 	Flags flags;                          ///< Flags for this airport type.
 	byte nofelements;                     ///< number of positions the airport consists of
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -27,9 +27,11 @@
 #include "core/geometry_func.hpp"
 #include "hotkeys.h"
 #include "vehicle_func.h"
+#include "sprite.h"

 #include "widgets/airport_widget.h"

+#include "table/strings.h"

 static AirportClassID _selected_airport_class; ///< the currently visible airport class
 static int _selected_airport_index;            ///< the index of the selected airport in the current class or -1
--- a/src/animated_tile_func.h
+++ b/src/animated_tile_func.h
@@ -7,7 +7,7 @@
 * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 */

-/** @file animated_tile_func.h %Tile animation! */
+/** @file animated_tile_func.h Tile animation! */

 #ifndef ANIMATED_TILE_FUNC_H
 #define ANIMATED_TILE_FUNC_H
--- a/src/articulated_vehicles.cpp
+++ b/src/articulated_vehicles.cpp
@@ -18,6 +18,7 @@
 #include "newgrf.h"

 #include "table/strings.h"
+#include "table/sprites.h"

 static const uint MAX_ARTICULATED_PARTS = 100; ///< Maximum of articulated parts per vehicle, i.e. when to abort calling the articulated vehicle callback.

@@ -54,16 +55,6 @@ static EngineID GetNextArticulatedPart(uint index, EngineID front_type, Vehicle
 	return GetNewEngineID(front_engine->GetGRF(), front_engine->type, callback);
 }

-/**
- * Does a NewGRF report that this should be an articulated vehicle?
- * @param engine_type The engine to check.
- * @return True iff the articulated engine callback flag is set.
- */
-bool IsArticulatedEngine(EngineID engine_type)
-{
-	return HasBit(EngInfo(engine_type)->callback_mask, CBM_VEHICLE_ARTIC_ENGINE);
-}
-
 /**
 * Count the number of articulated parts of an engine.
 * @param engine_type The engine to get the number of parts of.
@@ -119,13 +110,13 @@ static inline uint16 GetVehicleDefaultCapacity(EngineID engine, CargoID *cargo_t
 */
 static inline uint32 GetAvailableVehicleCargoTypes(EngineID engine, bool include_initial_cargo_type)
 {
-	const Engine *e = Engine::Get(engine);
-	if (!e->CanCarryCargo()) return 0;
+	uint32 cargoes = 0;
+	CargoID initial_cargo_type;

-	uint32 cargoes = e->info.refit_mask;
-
-	if (include_initial_cargo_type) {
-		SetBit(cargoes, e->GetDefaultCargoType());
+	if (GetVehicleDefaultCapacity(engine, &initial_cargo_type) > 0) {
+		const EngineInfo *ei = EngInfo(engine);
+		cargoes = ei->refit_mask;
+		if (include_initial_cargo_type && initial_cargo_type < NUM_CARGO) SetBit(cargoes, initial_cargo_type);
 	}

 	return cargoes;
@@ -250,7 +241,7 @@ bool IsArticulatedVehicleCarryingDifferentCargoes(const Vehicle *v, CargoID *car
 	CargoID first_cargo = CT_INVALID;

 	do {
-		if (v->cargo_type != CT_INVALID && v->GetEngine()->CanCarryCargo()) {
+		if (v->cargo_cap > 0 && v->cargo_type != CT_INVALID) {
 			if (first_cargo == CT_INVALID) first_cargo = v->cargo_type;
 			if (first_cargo != v->cargo_type) {
 				if (cargo_type != NULL) *cargo_type = CT_INVALID;
@@ -406,6 +397,6 @@ void AddArticulatedParts(Vehicle *first)

 		if (flip_image) v->spritenum++;

-		VehicleUpdatePosition(v);
+		VehicleMove(v, false);
 	}
 }
--- a/src/articulated_vehicles.h
+++ b/src/articulated_vehicles.h
@@ -23,7 +23,6 @@ uint32 GetUnionOfArticulatedRefitMasks(EngineID engine, bool include_initial_car
 uint32 GetIntersectionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type);
 bool IsArticulatedVehicleCarryingDifferentCargoes(const Vehicle *v, CargoID *cargo_type);
 bool IsArticulatedVehicleRefittable(EngineID engine);
-bool IsArticulatedEngine(EngineID engine_type);
 void CheckConsistencyOfArticulatedVehicle(const Vehicle *v);


--- a/src/autoreplace_cmd.cpp
+++ b/src/autoreplace_cmd.cpp
@@ -17,6 +17,7 @@
 #include "vehicle_func.h"
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
+#include "group.h"
 #include "articulated_vehicles.h"
 #include "core/random_func.hpp"

@@ -88,33 +89,6 @@ bool CheckAutoreplaceValidity(EngineID from, EngineID to, CompanyID company)
 	return EnginesHaveCargoInCommon(from, to);
 }

-/**
- * Check the capacity of all vehicles in a chain and spread cargo if needed.
- * @param v The vehicle to check.
- */
-void CheckCargoCapacity(Vehicle *v)
-{
-	assert(v == NULL || v->First() == v);
-
-	for (Vehicle *src = v; src != NULL; src = src->Next()) {
-		/* Do we need to more cargo away? */
-		if (src->cargo.Count() <= src->cargo_cap) continue;
-
-		/* We need to move a particular amount. Try that on the other vehicles. */
-		uint to_spread = src->cargo.Count() - src->cargo_cap;
-		for (Vehicle *dest = v; dest != NULL && to_spread != 0; dest = dest->Next()) {
-			if (dest->cargo.Count() >= dest->cargo_cap || dest->cargo_type != src->cargo_type) continue;
-
-			uint amount = min(to_spread, dest->cargo_cap - dest->cargo.Count());
-			src->cargo.MoveTo(&dest->cargo, amount, VehicleCargoList::MTA_UNLOAD, NULL);
-			to_spread -= amount;
-		}
-
-		/* Any left-overs will be thrown away, but not their feeder share. */
-		src->cargo.Truncate(src->cargo_cap);
-	}
-}
-
 /**
 * Transfer cargo from a single (articulated )old vehicle to the new vehicle chain
 * @param old_veh Old vehicle that will be sold
@@ -206,7 +180,7 @@ static CargoID GetNewCargoTypeForReplace(Vehicle *v, EngineID engine_type, bool
 		 * now we will figure out what cargo the train is carrying and refit to fit this */

 		for (v = v->First(); v != NULL; v = v->Next()) {
-			if (!v->GetEngine()->CanCarryCargo()) continue;
+			if (v->cargo_cap == 0) continue;
 			/* Now we found a cargo type being carried on the train and we will see if it is possible to carry to this one */
 			if (HasBit(available_cargo_types, v->cargo_type)) return v->cargo_type;
 		}
@@ -323,7 +297,7 @@ static inline CommandCost CmdStartStopVehicle(const Vehicle *v, bool evaluate_ca
 */
 static inline CommandCost CmdMoveVehicle(const Vehicle *v, const Vehicle *after, DoCommandFlag flags, bool whole_chain)
 {
-	return DoCommand(0, v->index | (whole_chain ? 1 : 0) << 20, after != NULL ? after->index : INVALID_VEHICLE, flags | DC_NO_CARGO_CAP_CHECK, CMD_MOVE_RAIL_VEHICLE);
+	return DoCommand(0, v->index | (whole_chain ? 1 : 0) << 20, after != NULL ? after->index : INVALID_VEHICLE, flags, CMD_MOVE_RAIL_VEHICLE);
 }

 /**
@@ -577,8 +551,6 @@ static CommandCost ReplaceChain(Vehicle **chain, DoCommandFlag flags, bool wagon
 						if (i == 0) old_head = NULL;
 					}
 				}
-
-				if ((flags & DC_EXEC) != 0) CheckCargoCapacity(new_head);
 			}

 			/* If we are not in DC_EXEC undo everything, i.e. rearrange old vehicles.
--- a/src/autoreplace_func.h
+++ b/src/autoreplace_func.h
@@ -14,6 +14,8 @@

 #include "command_type.h"
 #include "company_base.h"
+#include "engine_type.h"
+#include "group_type.h"

 void RemoveAllEngineReplacement(EngineRenewList *erl);
 EngineID EngineReplacement(EngineRenewList erl, EngineID engine, GroupID group);
--- a/src/autoreplace_gui.cpp
+++ b/src/autoreplace_gui.cpp
@@ -13,6 +13,7 @@
 #include "command_func.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
+#include "group.h"
 #include "rail.h"
 #include "strings_func.h"
 #include "window_func.h"
@@ -27,6 +28,7 @@

 #include "widgets/autoreplace_widget.h"

+#include "table/strings.h"

 uint GetEngineListHeight(VehicleType type);
 void DrawEngineList(VehicleType type, int x, int r, int y, const GUIEngineList *eng_list, uint16 min, uint16 max, EngineID selected_id, bool show_count, GroupID selected_group);
@@ -49,7 +51,7 @@ static int CDECL EngineNumberSorter(const EngineID *a, const EngineID *b)
 */
 void InvalidateAutoreplaceWindow(EngineID e, GroupID id_g)
 {
-	if (GetGroupNumEngines(_local_company, id_g, e) == 0 || GetGroupNumEngines(_local_company, ALL_GROUP, e) == 0) {
+	if (GetGroupNumEngines(_local_company, id_g, e) || GetGroupNumEngines(_local_company, ALL_GROUP, e) == 0) {
 		/* We don't have any of this engine type.
 		 * Either we just sold the last one, we build a new one or we stopped replacing it.
 		 * In all cases, we need to update the left list */
--- a/src/autoslope.h
+++ b/src/autoslope.h
@@ -14,6 +14,7 @@

 #include "company_func.h"
 #include "depot_func.h"
+#include "slope_func.h"
 #include "tile_map.h"

 /**
--- a/src/base_media_base.h
+++ b/src/base_media_base.h
@@ -15,8 +15,6 @@
 #include "fileio_func.h"
 #include "core/smallmap_type.hpp"
 #include "gfx_type.h"
-#include "textfile_type.h"
-#include "textfile_gui.h"

 /* Forward declare these; can't do 'struct X' in functions as older GCCs barf on that */
 struct IniFile;
@@ -35,7 +33,7 @@ struct MD5File {
 	uint8 hash[16];              ///< md5 sum of the file
 	const char *missing_warning; ///< warning when this file is missing

-	ChecksumResult CheckMD5(Subdirectory subdir, size_t max_size) const;
+	ChecksumResult CheckMD5(Subdirectory subdir) const;
 };

 /**
@@ -131,36 +129,6 @@ struct BaseSet {
 		/* Then fall back */
 		return this->description.Begin()->second;
 	}
-
-	/**
-	 * Calculate and check the MD5 hash of the supplied file.
-	 * @param file The file get the hash of.
-	 * @param subdir The sub directory to get the files from.
-	 * @return
-	 * - #CR_MATCH if the MD5 hash matches
-	 * - #CR_MISMATCH if the MD5 does not match
-	 * - #CR_NO_FILE if the file misses
-	 */
-	static MD5File::ChecksumResult CheckMD5(const MD5File *file, Subdirectory subdir)
-	{
-		return file->CheckMD5(subdir, SIZE_MAX);
-	}
-
-	/**
-	 * Search a textfile file next to this base media.
-	 * @param type The type of the textfile to search for.
-	 * @return The filename for the textfile, \c NULL otherwise.
-	 */
-	const char *GetTextfile(TextfileType type) const
-	{
-		for (uint i = 0; i < NUM_FILES; i++) {
-			const char *textfile = ::GetTextfile(type, BASESET_DIR, this->files[i].filename);
-			if (textfile != NULL) {
-				return textfile;
-			}
-		}
-		return NULL;
-	}
 };

 /**
@@ -241,8 +209,6 @@ struct GraphicsSet : BaseSet<GraphicsSet, MAX_GFT, true> {
 	BlitterType blitter;       ///< Blitter of this graphics set

 	bool FillSetDetails(struct IniFile *ini, const char *path, const char *full_filename);
-
-	static MD5File::ChecksumResult CheckMD5(const MD5File *file, Subdirectory subdir);
 };

 /** All data/functions related with replacing the base graphics. */
--- a/src/base_media_func.h
+++ b/src/base_media_func.h
@@ -131,7 +131,7 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const
 			file->missing_warning = strdup(item->value);
 		}

-		switch (T::CheckMD5(file, BASESET_DIR)) {
+		switch (file->CheckMD5(BASESET_DIR)) {
 			case MD5File::CR_MATCH:
 				this->valid_files++;
 				/* FALL THROUGH */
--- a/src/blitter/32bpp_anim.cpp
+++ b/src/blitter/32bpp_anim.cpp
@@ -10,6 +10,7 @@
 /** @file 32bpp_anim.cpp Implementation of the optimized 32 bpp blitter with animation support. */

 #include "../stdafx.h"
+#include "../core/math_func.hpp"
 #include "../video/video_driver.hpp"
 #include "32bpp_anim.hpp"

@@ -24,27 +25,27 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel
 	const SpriteData *src = (const SpriteData *)bp->sprite;

 	const Colour *src_px = (const Colour *)(src->data + src->offset[zoom][0]);
-	const uint16 *src_n  = (const uint16 *)(src->data + src->offset[zoom][1]);
+	const uint8  *src_n  = (const uint8  *)(src->data + src->offset[zoom][1]);

 	for (uint i = bp->skip_top; i != 0; i--) {
 		src_px = (const Colour *)((const byte *)src_px + *(const uint32 *)src_px);
-		src_n  = (const uint16 *)((const byte *)src_n  + *(const uint32 *)src_n);
+		src_n += *(const uint32 *)src_n;
 	}

 	uint32 *dst = (uint32 *)bp->dst + bp->top * bp->pitch + bp->left;
-	uint16 *anim = this->anim_buf + ((uint32 *)bp->dst - (uint32 *)_screen.dst_ptr) + bp->top * this->anim_buf_width + bp->left;
+	uint8 *anim = this->anim_buf + ((uint32 *)bp->dst - (uint32 *)_screen.dst_ptr) + bp->top * this->anim_buf_width + bp->left;

 	const byte *remap = bp->remap; // store so we don't have to access it via bp everytime

 	for (int y = 0; y < bp->height; y++) {
 		uint32 *dst_ln = dst + bp->pitch;
-		uint16 *anim_ln = anim + this->anim_buf_width;
+		uint8 *anim_ln = anim + this->anim_buf_width;

 		const Colour *src_px_ln = (const Colour *)((const byte *)src_px + *(const uint32 *)src_px);
 		src_px++;

-		const uint16 *src_n_ln = (const uint16 *)((const byte *)src_n + *(const uint32 *)src_n);
-		src_n += 2;
+		const uint8 *src_n_ln = src_n + *(const uint32 *)src_n;
+		src_n += 4;

 		uint32 *dst_end = dst + bp->skip_left;

@@ -105,9 +106,9 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel
 								*dst = src_px->data;
 								*anim = 0;
 							} else {
-								uint r = remap[GB(m, 0, 8)];
-								*anim = r | (m & 0xFF00);
-								if (r != 0) *dst = this->AdjustBrightness(this->LookupColourInPalette(r), GB(m, 8, 8));
+								uint r = remap[m];
+								*anim = r;
+								if (r != 0) *dst = this->LookupColourInPalette(r);
 							}
 							anim++;
 							dst++;
@@ -121,9 +122,9 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel
 								*dst = ComposeColourRGBANoCheck(src_px->r, src_px->g, src_px->b, src_px->a, *dst);
 								*anim = 0;
 							} else {
-								uint r = remap[GB(m, 0, 8)];
+								uint r = remap[m];
 								*anim = 0;
-								if (r != 0) *dst = ComposeColourPANoCheck(this->AdjustBrightness(this->LookupColourInPalette(r), GB(m, 8, 8)), src_px->a, *dst);
+								if (r != 0) *dst = ComposeColourPANoCheck(this->LookupColourInPalette(r), src_px->a, *dst);
 							}
 							anim++;
 							dst++;
@@ -144,14 +145,14 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel
 						src_px += n;
 						do {
 							*dst = MakeTransparent(*dst, 3, 4);
-							*anim = 0;
+							*anim = remap[*anim];
 							anim++;
 							dst++;
 						} while (--n != 0);
 					} else {
 						do {
 							*dst = MakeTransparent(*dst, (256 * 4 - src_px->a), 256 * 4);
-							*anim = 0;
+							*anim = remap[*anim];
 							anim++;
 							dst++;
 							src_px++;
@@ -163,25 +164,23 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel
 					if (src_px->a == 255) {
 						do {
 							/* Compiler assumes pointer aliasing, can't optimise this on its own */
-							uint m = GB(*src_n, 0, 8);
+							uint m = *src_n++;
 							/* Above PALETTE_ANIM_START is palette animation */
-							*anim++ = *src_n;
-							*dst++ = (m >= PALETTE_ANIM_START) ? this->AdjustBrightness(this->LookupColourInPalette(m), GB(*src_n, 8, 8)) : src_px->data;
+							*anim++ = m;
+							*dst++ = (m >= PALETTE_ANIM_START) ? this->LookupColourInPalette(m) : src_px->data;
 							src_px++;
-							src_n++;
 						} while (--n != 0);
 					} else {
 						do {
-							uint m = GB(*src_n, 0, 8);
+							uint m = *src_n++;
 							*anim++ = 0;
 							if (m >= PALETTE_ANIM_START) {
-								*dst = ComposeColourPANoCheck(this->AdjustBrightness(this->LookupColourInPalette(m), GB(*src_n, 8, 8)), src_px->a, *dst);
+								*dst = ComposeColourPANoCheck(this->LookupColourInPalette(m), src_px->a, *dst);
 							} else {
 								*dst = ComposeColourRGBANoCheck(src_px->r, src_px->g, src_px->b, src_px->a, *dst);
 							}
 							dst++;
 							src_px++;
-							src_n++;
 						} while (--n != 0);
 					}
 					break;
@@ -220,7 +219,7 @@ void Blitter_32bppAnim::DrawColourMappingRect(void *dst, int width, int height,
 	}

 	uint32 *udst = (uint32 *)dst;
-	uint16 *anim;
+	uint8 *anim;

 	anim = this->anim_buf + ((uint32 *)dst - (uint32 *)_screen.dst_ptr);

@@ -260,7 +259,7 @@ void Blitter_32bppAnim::SetPixel(void *video, int x, int y, uint8 colour)

 	/* Set the colour in the anim-buffer too, if we are rendering to the screen */
 	if (_screen_disable_anim) return;
-	this->anim_buf[((uint32 *)video - (uint32 *)_screen.dst_ptr) + x + y * this->anim_buf_width] = colour | (DEFAULT_BRIGHTNESS << 8);
+	this->anim_buf[((uint32 *)video - (uint32 *)_screen.dst_ptr) + x + y * this->anim_buf_width] = colour;
 }

 void Blitter_32bppAnim::DrawRect(void *video, int width, int height, uint8 colour)
@@ -272,18 +271,18 @@ void Blitter_32bppAnim::DrawRect(void *video, int width, int height, uint8 colou
 	}

 	uint32 colour32 = LookupColourInPalette(colour);
-	uint16 *anim_line;
+	uint8 *anim_line;

 	anim_line = ((uint32 *)video - (uint32 *)_screen.dst_ptr) + this->anim_buf;

 	do {
 		uint32 *dst = (uint32 *)video;
-		uint16 *anim = anim_line;
+		uint8 *anim = anim_line;

 		for (int i = width; i > 0; i--) {
 			*dst = colour32;
 			/* Set the colour in the anim-buffer too */
-			*anim = colour | (DEFAULT_BRIGHTNESS << 8);
+			*anim = colour;
 			dst++;
 			anim++;
 		}
@@ -298,19 +297,19 @@ void Blitter_32bppAnim::CopyFromBuffer(void *video, const void *src, int width,
 	assert(video >= _screen.dst_ptr && video <= (uint32 *)_screen.dst_ptr + _screen.width + _screen.height * _screen.pitch);
 	uint32 *dst = (uint32 *)video;
 	const uint32 *usrc = (const uint32 *)src;
-	uint16 *anim_line = ((uint32 *)video - (uint32 *)_screen.dst_ptr) + this->anim_buf;
+	uint8 *anim_line = ((uint32 *)video - (uint32 *)_screen.dst_ptr) + this->anim_buf;

 	for (; height > 0; height--) {
 		/* We need to keep those for palette animation. */
 		uint32 *dst_pal = dst;
-		uint16 *anim_pal = anim_line;
+		uint8 *anim_pal = anim_line;

 		memcpy(dst, usrc, width * sizeof(uint32));
 		usrc += width;
 		dst += _screen.pitch;
 		/* Copy back the anim-buffer */
-		memcpy(anim_line, usrc, width * sizeof(uint16));
-		usrc = (const uint32 *)((const uint16 *)usrc + width);
+		memcpy(anim_line, usrc, width * sizeof(uint8));
+		usrc = (const uint32 *)((const uint8 *)usrc + width);
 		anim_line += this->anim_buf_width;

 		/* Okay, it is *very* likely that the image we stored is using
@@ -321,10 +320,10 @@ void Blitter_32bppAnim::CopyFromBuffer(void *video, const void *src, int width,
 		 * for just the cursor. This just copies the implementation of
 		 * palette animation, much cheaper though slightly nastier. */
 		for (int i = 0; i < width; i++) {
-			uint colour = GB(*anim_pal, 0, 8);
-			if (colour >= PALETTE_ANIM_START) {
+			uint colour = *anim_pal;
+			if (IsInsideBS(colour, PALETTE_ANIM_START, PALETTE_ANIM_SIZE)) {
 				/* Update this pixel */
-				*dst_pal = this->AdjustBrightness(LookupColourInPalette(colour), GB(*anim_pal, 8, 8));
+				*dst_pal = LookupColourInPalette(colour);
 			}
 			dst_pal++;
 			anim_pal++;
@@ -338,7 +337,7 @@ void Blitter_32bppAnim::CopyToBuffer(const void *video, void *dst, int width, in
 	assert(video >= _screen.dst_ptr && video <= (uint32 *)_screen.dst_ptr + _screen.width + _screen.height * _screen.pitch);
 	uint32 *udst = (uint32 *)dst;
 	const uint32 *src = (const uint32 *)video;
-	const uint16 *anim_line;
+	const uint8 *anim_line;

 	if (this->anim_buf == NULL) return;

@@ -349,8 +348,8 @@ void Blitter_32bppAnim::CopyToBuffer(const void *video, void *dst, int width, in
 		src += _screen.pitch;
 		udst += width;
 		/* Copy the anim-buffer */
-		memcpy(udst, anim_line, width * sizeof(uint16));
-		udst = (uint32 *)((uint16 *)udst + width);
+		memcpy(udst, anim_line, width * sizeof(uint8));
+		udst = (uint32 *)((uint8 *)udst + width);
 		anim_line += this->anim_buf_width;
 	}
 }
@@ -359,7 +358,7 @@ void Blitter_32bppAnim::ScrollBuffer(void *video, int &left, int &top, int &widt
 {
 	assert(!_screen_disable_anim);
 	assert(video >= _screen.dst_ptr && video <= (uint32 *)_screen.dst_ptr + _screen.width + _screen.height * _screen.pitch);
-	uint16 *dst, *src;
+	uint8 *dst, *src;

 	/* We need to scroll the anim-buffer too */
 	if (scroll_y > 0) {
@@ -376,7 +375,7 @@ void Blitter_32bppAnim::ScrollBuffer(void *video, int &left, int &top, int &widt
 		uint tw = width + (scroll_x >= 0 ? -scroll_x : scroll_x);
 		uint th = height - scroll_y;
 		for (; th > 0; th--) {
-			memcpy(dst, src, tw * sizeof(uint16));
+			memcpy(dst, src, tw * sizeof(uint8));
 			src -= this->anim_buf_width;
 			dst -= this->anim_buf_width;
 		}
@@ -397,7 +396,7 @@ void Blitter_32bppAnim::ScrollBuffer(void *video, int &left, int &top, int &widt
 		uint tw = width + (scroll_x >= 0 ? -scroll_x : scroll_x);
 		uint th = height + scroll_y;
 		for (; th > 0; th--) {
-			memmove(dst, src, tw * sizeof(uint16));
+			memmove(dst, src, tw * sizeof(uint8));
 			src += this->anim_buf_width;
 			dst += this->anim_buf_width;
 		}
@@ -408,7 +407,7 @@ void Blitter_32bppAnim::ScrollBuffer(void *video, int &left, int &top, int &widt

 int Blitter_32bppAnim::BufferSize(int width, int height)
 {
-	return width * height * (sizeof(uint32) + sizeof(uint16));
+	return width * height * (sizeof(uint32) + sizeof(uint8));
 }

 void Blitter_32bppAnim::PaletteAnimate(const Palette &palette)
@@ -416,21 +415,22 @@ void Blitter_32bppAnim::PaletteAnimate(const Palette &palette)
 	assert(!_screen_disable_anim);

 	this->palette = palette;
-	/* If first_dirty is 0, it is for 8bpp indication to send the new
-	 *  palette. However, only the animation colours might possibly change.
-	 *  Especially when going between toyland and non-toyland. */
-	assert(this->palette.first_dirty == PALETTE_ANIM_START || this->palette.first_dirty == 0);
+	/* Never repaint the transparency pixel */
+	if (this->palette.first_dirty == 0) {
+		this->palette.first_dirty++;
+		this->palette.count_dirty--;
+	}

-	const uint16 *anim = this->anim_buf;
+	const uint8 *anim = this->anim_buf;
 	uint32 *dst = (uint32 *)_screen.dst_ptr;

 	/* Let's walk the anim buffer and try to find the pixels */
 	for (int y = this->anim_buf_height; y != 0 ; y--) {
 		for (int x = this->anim_buf_width; x != 0 ; x--) {
-			uint colour = GB(*anim, 0, 8);
-			if (colour >= PALETTE_ANIM_START) {
+			uint colour = *anim;
+			if (IsInsideBS(colour, this->palette.first_dirty, this->palette.count_dirty)) {
 				/* Update this pixel */
-				*dst = this->AdjustBrightness(LookupColourInPalette(colour), GB(*anim, 8, 8));
+				*dst = LookupColourInPalette(colour);
 			}
 			dst++;
 			anim++;
@@ -452,7 +452,7 @@ void Blitter_32bppAnim::PostResize()
 	if (_screen.width != this->anim_buf_width || _screen.height != this->anim_buf_height) {
 		/* The size of the screen changed; we can assume we can wipe all data from our buffer */
 		free(this->anim_buf);
-		this->anim_buf = CallocT<uint16>(_screen.width * _screen.height);
+		this->anim_buf = CallocT<uint8>(_screen.width * _screen.height);
 		this->anim_buf_width = _screen.width;
 		this->anim_buf_height = _screen.height;
 	}
--- a/src/blitter/32bpp_anim.hpp
+++ b/src/blitter/32bpp_anim.hpp
@@ -17,7 +17,7 @@
 /** The optimised 32 bpp blitter with palette animation. */
 class Blitter_32bppAnim FINAL : public Blitter_32bppOptimized {
 private:
-	uint16 *anim_buf;    ///< In this buffer we keep track of the 8bpp indexes so we can do palette animation
+	uint8 *anim_buf;     ///< In this buffer we keep track of the 8bpp indexes so we can do palette animation
 	int anim_buf_width;  ///< The width of the animation buffer.
 	int anim_buf_height; ///< The height of the animation buffer.
 	Palette palette;     ///< The current palette.
@@ -41,7 +41,7 @@ public:
 	/* virtual */ Blitter::PaletteAnimation UsePaletteAnimation();

 	/* virtual */ const char *GetName() { return "32bpp-anim"; }
-	/* virtual */ int GetBytesPerPixel() { return 6; }
+	/* virtual */ int GetBytesPerPixel() { return 5; }
 	/* virtual */ void PostResize();

 	/**
--- a/src/blitter/32bpp_base.hpp
+++ b/src/blitter/32bpp_base.hpp
@@ -14,7 +14,6 @@

 #include "base.hpp"
 #include "../core/bitmath_func.hpp"
-#include "../core/math_func.hpp"
 #include "../gfx_func.h"

 /** Base for all 32bpp blitters. */
@@ -135,33 +134,6 @@ public:

 		return ComposeColour(0xFF, colour, colour, colour);
 	}
-
-	static const int DEFAULT_BRIGHTNESS = 64;
-
-	static inline uint32 AdjustBrightness(uint32 colour, uint8 brightness)
-	{
-		/* Shortcut for normal brightness */
-		if (brightness == DEFAULT_BRIGHTNESS) return colour;
-
-		uint16 ob = 0;
-		uint16 r = GB(colour, 16, 8) * brightness / DEFAULT_BRIGHTNESS;
-		uint16 g = GB(colour, 8,  8) * brightness / DEFAULT_BRIGHTNESS;
-		uint16 b = GB(colour, 0,  8) * brightness / DEFAULT_BRIGHTNESS;
-
-		/* Sum overbright */
-		if (r > 255) ob += r - 255;
-		if (g > 255) ob += g - 255;
-		if (b > 255) ob += b - 255;
-
-		if (ob == 0) return ComposeColour(GB(colour, 24, 8), r, g, b);
-
-		/* Reduce overbright strength */
-		ob /= 2;
-		return ComposeColour(GB(colour, 24, 8),
-		                     r >= 255 ? 255 : min(r + ob * (255 - r) / 256, 255),
-		                     g >= 255 ? 255 : min(g + ob * (255 - g) / 256, 255),
-		                     b >= 255 ? 255 : min(b + ob * (255 - b) / 256, 255));
-	}
 };

 #endif /* BLITTER_32BPP_BASE_HPP */
--- a/src/blitter/32bpp_optimized.cpp
+++ b/src/blitter/32bpp_optimized.cpp
@@ -12,6 +12,7 @@
 #include "../stdafx.h"
 #include "../zoom_func.h"
 #include "../settings_type.h"
+#include "../core/math_func.hpp"
 #include "32bpp_optimized.hpp"

 /** Instantiation of the optimized 32bpp blitter factory. */
@@ -35,12 +36,12 @@ inline void Blitter_32bppOptimized::Draw(const Blitter::BlitterParams *bp, ZoomL
 	/* src_n  : each line begins with uint32 n = 'number of bytes in this line',
 	 *          then interleaved stream of 'm' and 'n' channels. 'm' is remap,
 	 *          'n' is number of bytes with the same alpha channel class */
-	const uint16 *src_n  = (const uint16 *)(src->data + src->offset[zoom][1]);
+	const uint8  *src_n  = (const uint8  *)(src->data + src->offset[zoom][1]);

 	/* skip upper lines in src_px and src_n */
 	for (uint i = bp->skip_top; i != 0; i--) {
 		src_px = (const Colour *)((const byte *)src_px + *(const uint32 *)src_px);
-		src_n = (const uint16 *)((const byte *)src_n + *(const uint32 *)src_n);
+		src_n += *(const uint32 *)src_n;
 	}

 	/* skip lines in dst */
@@ -58,8 +59,8 @@ inline void Blitter_32bppOptimized::Draw(const Blitter::BlitterParams *bp, ZoomL
 		src_px++;

 		/* next src_n line begins here */
-		const uint16 *src_n_ln = (const uint16 *)((const byte *)src_n + *(const uint32 *)src_n);
-		src_n += 2;
+		const uint8 *src_n_ln = src_n + *(const uint32 *)src_n;
+		src_n += 4;

 		/* we will end this line when we reach this point */
 		uint32 *dst_end = dst + bp->skip_left;
@@ -118,8 +119,8 @@ inline void Blitter_32bppOptimized::Draw(const Blitter::BlitterParams *bp, ZoomL
 							if (m == 0) {
 								*dst = src_px->data;
 							} else {
-								uint r = remap[GB(m, 0, 8)];
-								if (r != 0) *dst = this->AdjustBrightness(this->LookupColourInPalette(r), GB(m, 8, 8));
+								uint r = remap[m];
+								if (r != 0) *dst = this->LookupColourInPalette(r);
 							}
 							dst++;
 							src_px++;
@@ -131,8 +132,8 @@ inline void Blitter_32bppOptimized::Draw(const Blitter::BlitterParams *bp, ZoomL
 							if (m == 0) {
 								*dst = ComposeColourRGBANoCheck(src_px->r, src_px->g, src_px->b, src_px->a, *dst);
 							} else {
-								uint r = remap[GB(m, 0, 8)];
-								if (r != 0) *dst = ComposeColourPANoCheck(this->AdjustBrightness(this->LookupColourInPalette(r), GB(m, 8, 8)), src_px->a, *dst);
+								uint r = remap[m];
+								if (r != 0) *dst = ComposeColourPANoCheck(this->LookupColourInPalette(r), src_px->a, *dst);
 							}
 							dst++;
 							src_px++;
@@ -207,6 +208,55 @@ void Blitter_32bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode,
 	}
 }

+/**
+ * Resizes the sprite in a very simple way, takes every n-th pixel and every n-th row
+ *
+ * @param sprite_src sprite to resize
+ * @param zoom resizing scale
+ * @return resized sprite
+ */
+static const SpriteLoader::Sprite *ResizeSprite(const SpriteLoader::Sprite *sprite_src, ZoomLevel zoom)
+{
+	SpriteLoader::Sprite *sprite = MallocT<SpriteLoader::Sprite>(1);
+
+	if (zoom == ZOOM_LVL_NORMAL) {
+		memcpy(sprite, sprite_src, sizeof(*sprite));
+		uint size = sprite_src->height * sprite_src->width;
+		sprite->data = MallocT<SpriteLoader::CommonPixel>(size);
+		memcpy(sprite->data, sprite_src->data, size * sizeof(SpriteLoader::CommonPixel));
+		return sprite;
+	}
+
+	sprite->height = UnScaleByZoom(sprite_src->height, zoom);
+	sprite->width  = UnScaleByZoom(sprite_src->width,  zoom);
+	sprite->x_offs = UnScaleByZoom(sprite_src->x_offs, zoom);
+	sprite->y_offs = UnScaleByZoom(sprite_src->y_offs, zoom);
+
+	uint size = sprite->height * sprite->width;
+	SpriteLoader::CommonPixel *dst = sprite->data = CallocT<SpriteLoader::CommonPixel>(size);
+
+	const SpriteLoader::CommonPixel *src = (SpriteLoader::CommonPixel *)sprite_src->data;
+	const SpriteLoader::CommonPixel *src_end = src + sprite_src->height * sprite_src->width;
+
+	uint scaled_1 = ScaleByZoom(1, zoom);
+
+	for (uint y = 0; y < sprite->height; y++) {
+		if (src >= src_end) src = src_end - sprite_src->width;
+
+		const SpriteLoader::CommonPixel *src_ln = src + sprite_src->width * scaled_1;
+		for (uint x = 0; x < sprite->width; x++) {
+			if (src >= src_ln) src = src_ln - 1;
+			*dst = *src;
+			dst++;
+			src += scaled_1;
+		}
+
+		src = src_ln;
+	}
+
+	return sprite;
+}
+
 Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator)
 {
 	/* streams of pixels (a, r, g, b channels)
@@ -220,7 +270,7 @@ Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPr
 	 *
 	 * it has to be stored in one stream so fewer registers are used -
 	 * x86 has problems with register allocation even with this solution */
-	uint16 *dst_n_orig[ZOOM_LVL_COUNT];
+	uint8  *dst_n_orig[ZOOM_LVL_COUNT];

 	/* lengths of streams */
 	uint32 lengths[ZOOM_LVL_COUNT][2];
@@ -238,12 +288,12 @@ Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPr
 	}

 	for (ZoomLevel z = zoom_min; z <= zoom_max; z++) {
-		const SpriteLoader::Sprite *src_orig = &sprite[z];
+		const SpriteLoader::Sprite *src_orig = ResizeSprite(sprite, z);

 		uint size = src_orig->height * src_orig->width;

 		dst_px_orig[z] = CallocT<Colour>(size + src_orig->height * 2);
-		dst_n_orig[z]  = CallocT<uint16>(size * 2 + src_orig->height * 4 * 2);
+		dst_n_orig[z]  = CallocT<uint8>(size * 2 + src_orig->height * 4 * 2);

 		uint32 *dst_px_ln = (uint32 *)dst_px_orig[z];
 		uint32 *dst_n_ln  = (uint32 *)dst_n_orig[z];
@@ -252,9 +302,9 @@ Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPr

 		for (uint y = src_orig->height; y > 0; y--) {
 			Colour *dst_px = (Colour *)(dst_px_ln + 1);
-			uint16 *dst_n = (uint16 *)(dst_n_ln + 1);
+			uint8 *dst_n = (uint8 *)(dst_n_ln + 1);

-			uint16 *dst_len = dst_n++;
+			uint8 *dst_len = dst_n++;

 			uint last = 3;
 			int len = 0;
@@ -263,7 +313,7 @@ Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPr
 				uint8 a = src->a;
 				uint t = a > 0 && a < 255 ? 1 : a;

-				if (last != t || len == 65535) {
+				if (last != t || len == 255) {
 					if (last != 3) {
 						*dst_len = len;
 						dst_len = dst_n++;
@@ -278,15 +328,8 @@ Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPr
 					dst_px->a = a;
 					*dst_n = src->m;
 					if (src->m != 0) {
-						/* Get brightest value */
-						uint8 rgb_max = max(src->r, max(src->g, src->b));
-
-						/* Black pixel (8bpp or old 32bpp image), so use default value */
-						if (rgb_max == 0) rgb_max = DEFAULT_BRIGHTNESS;
-						*dst_n |= rgb_max << 8;
-
 						/* Pre-convert the mapping channel to a RGB value */
-						uint32 colour = this->AdjustBrightness(this->LookupColourInPalette(src->m), rgb_max);
+						uint32 colour = this->LookupColourInPalette(src->m);
 						dst_px->r = GB(colour, 16, 8);
 						dst_px->g = GB(colour, 8,  8);
 						dst_px->b = GB(colour, 0,  8);
@@ -311,7 +354,7 @@ Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPr
 			}

 			dst_px = (Colour *)AlignPtr(dst_px, 4);
-			dst_n  = (uint16 *)AlignPtr(dst_n, 4);
+			dst_n  = (uint8 *)AlignPtr(dst_n, 4);

 			*dst_px_ln = (uint8 *)dst_px - (uint8 *)dst_px_ln;
 			*dst_n_ln  = (uint8 *)dst_n  - (uint8 *)dst_n_ln;
@@ -322,6 +365,9 @@ Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPr

 		lengths[z][0] = (byte *)dst_px_ln - (byte *)dst_px_orig[z]; // all are aligned to 4B boundary
 		lengths[z][1] = (byte *)dst_n_ln  - (byte *)dst_n_orig[z];
+
+		free(src_orig->data);
+		free(src_orig);
 	}

 	uint len = 0; // total length of data
@@ -337,7 +383,6 @@ Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPr
 	dest_sprite->y_offs = sprite->y_offs;

 	SpriteData *dst = (SpriteData *)dest_sprite->data;
-	memset(dst, 0, sizeof(*dst));

 	for (ZoomLevel z = zoom_min; z <= zoom_max; z++) {
 		dst->offset[z][0] = z == zoom_min ? 0 : lengths[z - 1][1] + dst->offset[z - 1][1];
--- a/src/blitter/32bpp_simple.cpp
+++ b/src/blitter/32bpp_simple.cpp
@@ -20,11 +20,11 @@ static FBlitter_32bppSimple iFBlitter_32bppSimple;

 void Blitter_32bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom)
 {
-	const Blitter_32bppSimple::Pixel *src, *src_line;
+	const SpriteLoader::CommonPixel *src, *src_line;
 	uint32 *dst, *dst_line;

 	/* Find where to start reading in the source sprite */
-	src_line = (const Blitter_32bppSimple::Pixel *)bp->sprite + (bp->skip_top * bp->sprite_width + bp->skip_left) * ScaleByZoom(1, zoom);
+	src_line = (const SpriteLoader::CommonPixel *)bp->sprite + (bp->skip_top * bp->sprite_width + bp->skip_left) * ScaleByZoom(1, zoom);
 	dst_line = (uint32 *)bp->dst + bp->top * bp->pitch + bp->left;

 	for (int y = 0; y < bp->height; y++) {
@@ -41,7 +41,7 @@ void Blitter_32bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Zoo
 					if (src->m == 0) {
 						if (src->a != 0) *dst = ComposeColourRGBA(src->r, src->g, src->b, src->a, *dst);
 					} else {
-						if (bp->remap[src->m] != 0) *dst = ComposeColourPA(this->AdjustBrightness(this->LookupColourInPalette(bp->remap[src->m]), src->v), src->a, *dst);
+						if (bp->remap[src->m] != 0) *dst = ComposeColourPA(this->LookupColourInPalette(bp->remap[src->m]), src->a, *dst);
 					}
 					break;

@@ -94,42 +94,26 @@ void Blitter_32bppSimple::DrawColourMappingRect(void *dst, int width, int height

 Sprite *Blitter_32bppSimple::Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator)
 {
-	Blitter_32bppSimple::Pixel *dst;
-	Sprite *dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + sprite->height * sprite->width * sizeof(*dst));
+	Sprite *dest_sprite;
+	SpriteLoader::CommonPixel *dst;
+	dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + sprite->height * sprite->width * sizeof(SpriteLoader::CommonPixel));

 	dest_sprite->height = sprite->height;
 	dest_sprite->width  = sprite->width;
 	dest_sprite->x_offs = sprite->x_offs;
 	dest_sprite->y_offs = sprite->y_offs;

-	dst = (Blitter_32bppSimple::Pixel *)dest_sprite->data;
-	SpriteLoader::CommonPixel *src = (SpriteLoader::CommonPixel *)sprite->data;
+	dst = (SpriteLoader::CommonPixel *)dest_sprite->data;

+	memcpy(dst, sprite->data, sprite->height * sprite->width * sizeof(SpriteLoader::CommonPixel));
 	for (int i = 0; i < sprite->height * sprite->width; i++) {
-		if (src->m == 0) {
-			dst[i].r = src->r;
-			dst[i].g = src->g;
-			dst[i].b = src->b;
-			dst[i].a = src->a;
-			dst[i].m = 0;
-			dst[i].v = 0;
-		} else {
-			/* Get brightest value */
-			uint8 rgb_max = max(src->r, max(src->g, src->b));
-
-			/* Black pixel (8bpp or old 32bpp image), so use default value */
-			if (rgb_max == 0) rgb_max = DEFAULT_BRIGHTNESS;
-			dst[i].v = rgb_max;
-
+		if (dst[i].m != 0) {
 			/* Pre-convert the mapping channel to a RGB value */
-			uint colour = this->AdjustBrightness(this->LookupColourInPalette(src->m), dst[i].v);
+			uint colour = this->LookupColourInPalette(dst[i].m);
 			dst[i].r = GB(colour, 16, 8);
 			dst[i].g = GB(colour, 8,  8);
 			dst[i].b = GB(colour, 0,  8);
-			dst[i].a = src->a;
-			dst[i].m = src->m;
 		}
-		src++;
 	}

 	return dest_sprite;
--- a/src/blitter/32bpp_simple.hpp
+++ b/src/blitter/32bpp_simple.hpp
@@ -17,14 +17,6 @@

 /** The most trivial 32 bpp blitter (without palette animation). */
 class Blitter_32bppSimple : public Blitter_32bppBase {
-	struct Pixel {
-		uint8 r;  ///< Red-channel
-		uint8 g;  ///< Green-channel
-		uint8 b;  ///< Blue-channel
-		uint8 a;  ///< Alpha-channel
-		uint8 m;  ///< Remap-channel
-		uint8 v;  ///< Brightness-channel
-	};
 public:
 	/* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
 	/* virtual */ void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal);
--- a/src/blitter/8bpp_optimized.cpp
+++ b/src/blitter/8bpp_optimized.cpp
@@ -130,7 +130,7 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPro
 	}

 	for (ZoomLevel i = zoom_min; i <= zoom_max; i++) {
-		memory += sprite[i].width * sprite[i].height;
+		memory += UnScaleByZoom(sprite->height, i) * UnScaleByZoom(sprite->width, i);
 	}

 	/* We have no idea how much memory we really need, so just guess something */
@@ -141,7 +141,6 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPro
 	 * and the memory usage is quite low. */
 	static ReusableBuffer<byte> temp_buffer;
 	SpriteData *temp_dst = (SpriteData *)temp_buffer.Allocate(memory);
-	memset(temp_dst, 0, sizeof(*temp_dst));
 	byte *dst = temp_dst->data;

 	/* Make the sprites per zoom-level */
@@ -151,8 +150,9 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPro
 		temp_dst->offset[i] = offset;

 		/* cache values, because compiler can't cache it */
-		int scaled_height = sprite[i].height;
-		int scaled_width  = sprite[i].width;
+		int scaled_height = UnScaleByZoom(sprite->height, i);
+		int scaled_width  = UnScaleByZoom(sprite->width,  i);
+		int scaled_1      =   ScaleByZoom(1,              i);

 		for (int y = 0; y < scaled_height; y++) {
 			uint trans = 0;
@@ -161,10 +161,18 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPro
 			byte *count_dst = NULL;

 			/* Store the scaled image */
-			const SpriteLoader::CommonPixel *src = &sprite[i].data[y * sprite[i].width];
+			const SpriteLoader::CommonPixel *src = &sprite->data[ScaleByZoom(y, i) * sprite->width];
+			const SpriteLoader::CommonPixel *src_end = &src[sprite->width];

 			for (int x = 0; x < scaled_width; x++) {
-				uint colour = src++->m;
+				uint colour = 0;
+
+				/* Get the colour keeping in mind the zoom-level */
+				for (int j = 0; j < scaled_1; j++) {
+					if (src->m != 0) colour = src->m;
+					/* Because of the scaling it might happen we read outside the buffer. Avoid that. */
+					if (++src == src_end) break;
+				}

 				if (last_colour == 0 || colour == 0 || pixels == 255) {
 					if (count_dst != NULL) {
--- a/src/bootstrap_gui.cpp
+++ b/src/bootstrap_gui.cpp
@@ -16,6 +16,7 @@
 #if defined(ENABLE_NETWORK) && defined(WITH_FREETYPE)

 #include "core/geometry_func.hpp"
+#include "fileio_func.h"
 #include "fontcache.h"
 #include "gfx_func.h"
 #include "network/network.h"
@@ -24,6 +25,7 @@
 #include "strings_func.h"
 #include "video/video_driver.hpp"
 #include "window_func.h"
+#include "window_gui.h"

 #include "widgets/bootstrap_widget.h"

--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -847,10 +847,9 @@ int DrawVehiclePurchaseInfo(int left, int right, int y, EngineID engine_number)
 		y += FONT_HEIGHT_NORMAL;
 	}

-	if (refittable) y = ShowRefitOptionsList(left, right, y, engine_number);
-
 	/* Additional text from NewGRF */
 	y = ShowAdditionalText(left, right, y, engine_number);
+	if (refittable) y = ShowRefitOptionsList(left, right, y, engine_number);

 	return y;
 }
--- a/src/cargo_type.h
+++ b/src/cargo_type.h
@@ -105,33 +105,6 @@ public:
 	{
 		return this->amount[cargo];
 	}
-
-	/**
-	 * Get the sum of all cargo amounts.
-	 * @return The sum.
-	 */
-	template <typename T>
-	inline const T GetSum() const
-	{
-		T ret = 0;
-		for (size_t i = 0; i < lengthof(this->amount); i++) {
-			ret += this->amount[i];
-		}
-		return ret;
-	}
-
-	/**
-	 * Get the amount of cargos that have an amount.
-	 * @return The amount.
-	 */
-	inline byte GetCount() const
-	{
-		byte count = 0;
-		for (size_t i = 0; i < lengthof(this->amount); i++) {
-			if (this->amount[i] != 0) count++;
-		}
-		return count;
-	}
 };


--- a/src/cargotype.cpp
+++ b/src/cargotype.cpp
@@ -11,6 +11,7 @@

 #include "stdafx.h"
 #include "cargotype.h"
+#include "core/bitmath_func.hpp"
 #include "newgrf_cargo.h"
 #include "string_func.h"
 #include "strings_func.h"
@@ -38,12 +39,7 @@ void SetupCargoForClimate(LandscapeID l)

 	/* Reset and disable all cargo types */
 	memset(CargoSpec::array, 0, sizeof(CargoSpec::array));
-	for (CargoID i = 0; i < lengthof(CargoSpec::array); i++) {
-		CargoSpec::Get(i)->bitnum = INVALID_CARGO;
-
-		/* Set defaults for newer properties, which old GRFs do not know */
-		CargoSpec::Get(i)->multiplier = 0x100;
-	}
+	for (CargoID i = 0; i < lengthof(CargoSpec::array); i++) CargoSpec::Get(i)->bitnum = INVALID_CARGO;

 	_cargo_mask = 0;

--- a/src/cargotype.h
+++ b/src/cargotype.h
@@ -59,7 +59,6 @@ struct CargoSpec {
 	uint8 legend_colour;
 	uint8 rating_colour;
 	uint8 weight;                    ///< Weight of a single unit of this cargo type in 1/16 ton (62.5 kg).
-	uint16 multiplier;               ///< Capacity multiplier for vehicles. (8 fractional bits)
 	uint16 initial_payment;
 	uint8 transit_days[2];

--- a/Show More
+++ b/Show More