(svn r23971) -Release: 1.2.0-RC1; tag you're it!

(svn r23970) [1.2] -Prepare: 1.2.0-RC1
(svn r23968) [1.2] -Branch: there we go...
2025-08-13 17:49:10 +00:00 · 2012-02-19 20:08:27 +00:00 · 2012-02-19 19:53:20 +00:00 · 2012-02-19 19:07:09 +00:00
1209 changed files with 92425 additions and 184411 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ bin/ai/*
 bin/baseset/*
 !bin/baseset/openttd.grf
 !bin/baseset/opntitle.dat
-!bin/baseset/orig_extra.grf
 !bin/baseset/orig_*.obg
 !bin/baseset/orig_*.obs
 !bin/baseset/no_sound.obs
@@ -23,13 +22,9 @@ bundles/*
 docs/aidocs/*
 docs/gamedocs/*
 docs/source/*
-.kdev4
-.kdev4/*
-*.kdev4
 media/openttd.desktop
 media/openttd.desktop.install
 objs/*
-projects/.vs
 projects/Debug
 projects/Release
 projects/*.ncb
@@ -38,8 +33,6 @@ projects/*.sdf
 projects/*.opensdf
 projects/*.vcproj.*.user
 projects/*.vcxproj.user
-projects/*.VC.db
-projects/*.VC.opendb
 src/rev.cpp
 src/os/windows/ottdres.rc

--- a/.hgignore
+++ b/.hgignore
@@ -13,16 +13,12 @@ config.pwd
 docs/aidocs/*
 docs/gamedocs/*
 docs/source/*
-.kdev4
-.kdev4/*
-*.kdev4
 Makefile
 Makefile.am
 Makefile.bundle
 media/openttd.desktop
 media/openttd.desktop.install
 objs/*
-projects/.vs
 projects/*.ncb
 projects/*.suo
 projects/*.sdf
--- a/4
+++ b/4
@@ -1,7 +1,3 @@
-This is the license which applies to OpenTTD with the exception of some
-3rd party modules. See readme.txt for details
-
-
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991

--- a/6
+++ b/6
@@ -97,7 +97,7 @@ EXCLUDE_PATTERNS       = */3rdparty */.svn */script/api
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             =./docs/
+IMAGE_PATH             =
 INPUT_FILTER           =
 FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
@@ -195,14 +195,14 @@ 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_SORT WITH_ICU_LAYOUT 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 FINAL=
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 TAGFILES               =
-GENERATE_TAGFILE       = objs/openttd.tag
+GENERATE_TAGFILE       = openttd.tag
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -10,9 +10,13 @@
 #

 # The revision is needed for the bundle name and creating an OSX application bundle.
+ifdef REVISION
+REV := $(REVISION)
+else
 # Detect the revision
 VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
 REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
+endif

 # Make sure we have something in REV
 ifeq ($(REV),)
@@ -26,13 +30,11 @@ endif
 # An OSX application bundle needs the data files, lang files and openttd executable in a different location.
 ifdef OSXAPP
 AI_DIR      = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai
-GAME_DIR    = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/game
 BASESET_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/baseset
 LANG_DIR    = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
 TTD_DIR     = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
 else
 AI_DIR      = $(BUNDLE_DIR)/ai
-GAME_DIR    = $(BUNDLE_DIR)/game
 BASESET_DIR = $(BUNDLE_DIR)/baseset
 LANG_DIR    = $(BUNDLE_DIR)/lang
 TTD_DIR     = $(BUNDLE_DIR)
@@ -47,7 +49,6 @@ bundle: all
 	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
 	$(Q)mkdir -p "$(TTD_DIR)"
 	$(Q)mkdir -p "$(AI_DIR)"
-	$(Q)mkdir -p "$(GAME_DIR)"
 	$(Q)mkdir -p "$(BASESET_DIR)"
 	$(Q)mkdir -p "$(LANG_DIR)"
 ifdef OSXAPP
@@ -62,7 +63,6 @@ ifeq ($(OS),UNIX)
 endif
 	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
 	$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut       "$(AI_DIR)/"
-	$(Q)cp "$(BIN_DIR)/game/"compat_*.nut     "$(GAME_DIR)/"
 	$(Q)cp "$(BIN_DIR)/baseset/"*.grf         "$(BASESET_DIR)/"
 	$(Q)cp "$(BIN_DIR)/baseset/"*.obg         "$(BASESET_DIR)/"
 	$(Q)cp "$(BIN_DIR)/baseset/"*.obs         "$(BASESET_DIR)/"
@@ -73,6 +73,7 @@ endif
 	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/32bpp.txt"       "$(BUNDLE_DIR)/docs/"
 	$(Q)cp "$(ROOT_DIR)/changelog.txt"        "$(BUNDLE_DIR)/"
 ifdef MAN_DIR
 	$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
@@ -84,15 +85,15 @@ endif
 	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
 ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
-	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | LC_ALL=C $(SORT) |  $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(BUNDLE_DIR)/media/openttd.desktop"
+	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) >> "$(BUNDLE_DIR)/media/openttd.desktop"
 	$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
 endif
 ifeq ($(TTD), openttd.exe)
 	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
 ifeq ($(OS), DOS)
-	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi/cwsdpmi.txt"   "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi.txt"   "$(BUNDLE_DIR)/docs/"
 ifndef STRIP
-	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi/cwsdpmi.exe"   "$(TTD_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi.exe"   "$(TTD_DIR)/"
 endif
 endif
 endif
@@ -172,7 +173,6 @@ install: bundle
 	$(Q)install -d "$(INSTALL_BINARY_DIR)"
 	$(Q)install -d "$(INSTALL_ICON_DIR)"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/ai"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/game"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/baseset"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/scripts"
@@ -183,7 +183,6 @@ else
 endif
 	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/ai/"* "$(INSTALL_DATA_DIR)/ai"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/game/"* "$(INSTALL_DATA_DIR)/game"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/baseset/"* "$(INSTALL_DATA_DIR)/baseset"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/scripts/"* "$(INSTALL_DATA_DIR)/scripts"
 ifndef DO_NOT_INSTALL_DOCS
--- a/Makefile.grf.in
+++ b/Makefile.grf.in
@@ -5,20 +5,21 @@
 # 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/>.
 #
-# Building requires GRFCodec.
+# Building requires GRFCodec and NFORenum. Older versions of GRFCodec are
+#  known to miscompile the graphics.
 #
-# Recent versions (including sources) can be found at:
+# Recent nightlies (including sources) of both can be found at:
 #  http://www.openttd.org/download-grfcodec
+#  http://www.openttd.org/download-nforenum
 #
-# The mercurial repository can be found at:
+# The mercurial repository of both can be found at:
 #  http://hg.openttdcoop.org/grfcodec
+#  http://hg.openttdcoop.org/nforenum
 #


 ROOT_DIR = !!ROOT_DIR!!
 GRF_DIR  = $(ROOT_DIR)/media/extra_grf
-BASESET_DIR = $(ROOT_DIR)/media/baseset
-LANG_DIR = $(ROOT_DIR)/src/lang
 BIN_DIR  = !!BIN_DIR!!/baseset
 OBJS_DIR = !!GRF_OBJS_DIR!!
 OS       = !!OS!!
@@ -35,7 +36,6 @@ endif

 GRFCODEC := !!GRFCODEC!!
 NFORENUM := !!NFORENUM!!
-CC_BUILD := !!CC_BUILD!!
 MD5SUM   := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum")

 # Some "should not be changed" settings.
@@ -44,50 +44,29 @@ PNG_FILES    := $(GRF_DIR)/*.png $(GRF_DIR)/rivers/*.png

 # Build the GRF.
 ifdef GRFCODEC
-all: $(BIN_DIR)/openttd.grf $(BIN_DIR)/orig_extra.grf $(BIN_DIR)/orig_dos.obg $(BIN_DIR)/orig_dos_de.obg $(BIN_DIR)/orig_win.obg $(BIN_DIR)/orig_dos.obs $(BIN_DIR)/orig_win.obs $(BIN_DIR)/no_sound.obs $(BIN_DIR)/orig_win.obm $(BIN_DIR)/no_music.obm
+all: $(BIN_DIR)/openttd.grf
 else
 all:
 endif

-$(OBJS_DIR)/langfiles.tmp: $(LANG_DIR)/*.txt
-	$(E) '$(STAGE) Collecting baseset translations'
-	$(Q) cat $^ > $@
+# Make sure the sprites directory exists.
+$(OBJS_DIR)/sprites:
+	$(Q)-mkdir "$@"

-$(BIN_DIR)/%.obg: $(BASESET_DIR)/%.obg $(BIN_DIR)/orig_extra.grf $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
-	$(E) '$(STAGE) Updating $(notdir $@)'
-	$(Q) sed 's/^ORIG_EXTRA.GRF    = *[0-9a-f]*$$/ORIG_EXTRA.GRF    = '`$(MD5SUM) $(BIN_DIR)/orig_extra.grf | sed 's@ .*@@'`'/' $< > $@.tmp
-	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $@.tmp >$@
-	$(Q) rm $@.tmp
+# Generic
+$(BIN_DIR)/openttd.grf: $(OBJS_DIR)/openttd.grf
+	$(Q)cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf
+	$(E) '$(STAGE) Updating base graphics sets'
+	$(Q) for grf in $(BIN_DIR)/orig*.obg; do sed 's/^OPENTTD.GRF  = [0-9a-f]*$$/OPENTTD.GRF  = '`$(MD5SUM) $(BIN_DIR)/openttd.grf | sed 's@ .*@@'`'/' $$grf > $$grf.tmp && mv $$grf.tmp $$grf; done

-$(BIN_DIR)/%.obs: $(BASESET_DIR)/%.obs $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
-	$(E) '$(STAGE) Updating $(notdir $@)'
-	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@
-
-$(BIN_DIR)/%.obm: $(BASESET_DIR)/%.obm $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
-	$(E) '$(STAGE) Updating $(notdir $@)'
-	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@
-
-# Compile extra grf
-$(BIN_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(GRF_DIR)/assemble_nfo.awk
+# Yeah, we'd like to use -i in the sed, but Mac OS X's sed and GNU sed just can't agree on the usage of -i. In any case either one of them fails.
+$(OBJS_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites
 	$(E) '$(STAGE) Assembling openttd.nfo'
-	$(Q)-mkdir -p $(OBJS_DIR)/sprites
 	$(Q)-cp $(PNG_FILES) $(OBJS_DIR)/sprites 2> /dev/null
-	$(Q) awk -f $(GRF_DIR)/assemble_nfo.awk $(GRF_DIR)/openttd.nfo > $(OBJS_DIR)/sprites/openttd.nfo
+	$(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)cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf
-
-# The copy operation of PNG_FILES is duplicated from the target 'openttd.grf', thus those targets may not run in parallel.
-$(BIN_DIR)/orig_extra.grf: $(PNG_FILES) $(NFO_FILES) $(GRF_DIR)/assemble_nfo.awk | $(BIN_DIR)/openttd.grf
-	$(E) '$(STAGE) Assembling orig_extra.nfo'
-	$(Q)-mkdir -p $(OBJS_DIR)/sprites
-	$(Q)-cp $(PNG_FILES) $(OBJS_DIR)/sprites 2> /dev/null
-	$(Q) awk -f $(GRF_DIR)/assemble_nfo.awk $(GRF_DIR)/orig_extra.nfo > $(OBJS_DIR)/sprites/orig_extra.nfo
-	$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/orig_extra.nfo
-	$(E) '$(STAGE) Compiling orig_extra.grf'
-	$(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/orig_extra.grf
-	$(Q)cp $(OBJS_DIR)/orig_extra.grf $(BIN_DIR)/orig_extra.grf
+	$(Q) $(GRFCODEC) -s -e -p1 $(OBJS_DIR)/openttd.grf

 # Clean up temporary files.
 clean:
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,6 +41,7 @@ TTDS        = $(SRC_DIRS:%=%/$(TTD))
 OS          = !!OS!!
 OSXAPP      = !!OSXAPP!!
 LIPO        = !!LIPO!!
+REVISION    = !!REVISION!!
 AWK         = !!AWK!!
 SORT        = !!SORT!!
 DISTCC      = !!DISTCC!!
@@ -144,15 +145,17 @@ mrproper:
 # output of profiling
 	$(Q)rm -f $(BIN_DIR)/gmon.out
 # output of generating 'API' documentation
+	$(Q)rm -f $(ROOT_DIR)/openttd.tag
 	$(Q)rm -rf $(ROOT_DIR)/docs/source
+# output of generating AI API documentation
+	$(Q)rm -f $(SRC_DIR)/ai/api/openttd.tag
 	$(Q)rm -rf $(ROOT_DIR)/docs/aidocs
-	$(Q)rm -rf $(ROOT_DIR)/docs/gamedocs
 # directories created by OpenTTD on regression testing
 	$(Q)rm -rf $(BIN_DIR)/ai/regression/content_download $(BIN_DIR)/ai/regression/save $(BIN_DIR)/ai/regression/scenario
 distclean: mrproper

 maintainer-clean: distclean
-	$(Q)rm -f $(BIN_DIR)/baseset/openttd.grf $(BIN_DIR)/baseset/orig_extra.grf $(BIN_DIR)/baseset/*.obg $(BIN_DIR)/baseset/*.obs $(BIN_DIR)/baseset/*.obm
+	$(Q)rm -f $(BIN_DIR)/baseset/openttd.grf

 depend:
 	@for dir in $(SRC_DIRS); do \
--- a/Makefile.lang.in
+++ b/Makefile.lang.in
@@ -14,7 +14,6 @@ LANGS_SRC     = $(shell ls $(LANG_DIR)/*.txt)
 LANGS         = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
 CXX_BUILD     = !!CXX_BUILD!!
 CFLAGS_BUILD  = !!CFLAGS_BUILD!!
-CXXFLAGS_BUILD= !!CXXFLAGS_BUILD!!
 LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
 STRGEN_FLAGS  = !!STRGEN_FLAGS!!
 STAGE         = !!STAGE!!
@@ -43,25 +42,25 @@ RES := $(shell mkdir -p $(BIN_DIR)/lang )

 all: table/strings.h $(LANGS)

-strgen_base.o: $(SRC_DIR)/strgen/strgen_base.cpp $(SRC_DIR)/strgen/strgen.h endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h $(SRC_DIR)/safeguards.h
+strgen_base.o: $(SRC_DIR)/strgen/strgen_base.cpp $(SRC_DIR)/strgen/strgen.h endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<

-strgen.o: $(SRC_DIR)/strgen/strgen.cpp $(SRC_DIR)/strgen/strgen.h endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h $(SRC_DIR)/safeguards.h
+strgen.o: $(SRC_DIR)/strgen/strgen.cpp $(SRC_DIR)/strgen/strgen.h endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<

-string.o: $(SRC_DIR)/string.cpp endian_host.h $(SRC_DIR)/safeguards.h
+string.o: $(SRC_DIR)/string.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<

-alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h $(SRC_DIR)/safeguards.h
+alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<

-getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/safeguards.h
+getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<

 lang/english.txt: $(LANG_DIR)/english.txt
 	$(Q)mkdir -p lang
@@ -69,7 +68,7 @@ lang/english.txt: $(LANG_DIR)/english.txt

 $(STRGEN): alloc_func.o string.o strgen_base.o strgen.o getoptdata.o
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $^ -o $@
+	$(Q)$(CXX_BUILD) $(LDFLAGS_BUILD) $^ -o $@

 table/strings.h: lang/english.txt $(STRGEN)
 	$(E) '$(STAGE) Generating $@'
@@ -88,7 +87,7 @@ endian_host.h: $(ENDIAN_CHECK)

 $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $< -o $@

 depend:

--- a/Makefile.setting.in
+++ b/Makefile.setting.in
@@ -10,7 +10,6 @@ ENDIAN_CHECK     = !!ENDIAN_CHECK!!
 SRC_DIR          = !!SRC_DIR!!
 CXX_BUILD        = !!CXX_BUILD!!
 CFLAGS_BUILD     = !!CFLAGS_BUILD!!
-CXXFLAGS_BUILD   = !!CXXFLAGS_BUILD!!
 LDFLAGS_BUILD    = !!LDFLAGS_BUILD!!
 STAGE            = !!STAGE!!
 SETTING_OBJS_DIR = !!SETTING_OBJS_DIR!!
@@ -28,29 +27,29 @@ endif

 all: table/settings.h

-settingsgen.o: $(SRC_DIR)/settingsgen/settingsgen.cpp $(SRC_DIR)/string_func.h $(SRC_DIR)/strings_type.h $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/ini_type.h $(SRC_DIR)/core/smallvec_type.hpp $(SRC_DIR)/safeguards.h
+settingsgen.o: $(SRC_DIR)/settingsgen/settingsgen.cpp $(SRC_DIR)/string_func.h $(SRC_DIR)/strings_type.h $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/ini_type.h $(SRC_DIR)/core/smallvec_type.hpp
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<

-alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h $(SRC_DIR)/safeguards.h
+alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<

-getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/safeguards.h
+getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<

-string.o: $(SRC_DIR)/string.cpp endian_host.h $(SRC_DIR)/safeguards.h
+string.o: $(SRC_DIR)/string.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<

-ini_load.o: $(SRC_DIR)/ini_load.cpp $(SRC_DIR)/core/alloc_func.hpp $(SRC_DIR)/core/mem_func.hpp $(SRC_DIR)/ini_type.h $(SRC_DIR)/string_func.h $(SRC_DIR)/safeguards.h
+ini_load.o: $(SRC_DIR)/ini_load.cpp $(SRC_DIR)/core/alloc_func.hpp $(SRC_DIR)/core/mem_func.hpp $(SRC_DIR)/ini_type.h $(SRC_DIR)/string_func.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<

 $(SETTINGSGEN): alloc_func.o string.o ini_load.o settingsgen.o getoptdata.o
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $^ -o $@
+	$(Q)$(CXX_BUILD) $(LDFLAGS_BUILD) $^ -o $@

 table/settings.h: $(SETTINGSGEN) $(SRC_DIR)/table/settings.h.preamble $(SRC_DIR)/table/settings.h.postamble $(SRC_DIR)/table/*.ini
 	$(E) '$(STAGE) Generating $@'
@@ -65,7 +64,7 @@ endian_host.h: $(ENDIAN_CHECK)

 $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $< -o $@

 depend:

--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -210,7 +210,7 @@ endif
 	{                                   \
 		print $$0                         \
 	}                                   \
-	' < Makefile.dep.tmp | sed 's@  *@ @g;s@ $$@@' | LC_ALL=C $(SORT) > Makefile.dep
+	' < Makefile.dep.tmp | sed 's@  *@ @g;s@ $$@@' | $(SORT) > Makefile.dep

 	$(Q)rm -f Makefile.dep.tmp Makefile.dep.tmp.bak

@@ -229,22 +229,10 @@ $(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'
 	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<

-$(filter-out %sse2.o, $(filter-out %ssse3.o, $(filter-out %sse4.o, $(OBJS_CPP)))): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
+$(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -o $@ $<

-$(filter %sse2.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -msse2 -o $@ $<
-
-$(filter %ssse3.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -mssse3 -o $@ $<
-
-$(filter %sse4.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -msse4.1 -o $@ $<
-
 $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
 	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<
@@ -288,7 +276,7 @@ endian_target.h: $(ENDIAN_CHECK) $(CONFIG_CACHE_ENDIAN)

 $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $< -o $@

 # Revision files

--- a/bin/ai/compat_0.7.nut
+++ b/bin/ai/compat_0.7.nut
@@ -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/>.
 */

-AILog.Info("0.7 API compatibility in effect:");
+AILog.Info("0.7 API compatability in effect:");
 AILog.Info(" - AITown::GetLastMonthProduction's behaviour has slightly changed.");
 AILog.Info(" - AISubsidy::GetDestination returns STATION_INVALID for awarded subsidies.");
 AILog.Info(" - AISubsidy::GetSource returns STATION_INVALID for awarded subsidies.");
@@ -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
@@ -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/>.
 */

-AILog.Info("1.0 API compatibility in effect.");
+AILog.Info("1.0 API compatability in effect.");

 AIRoad._BuildRoadStation <- AIRoad.BuildRoadStation;
 AIRoad.BuildRoadStation <- function(tile, front, road_veh_type, station_id)
@@ -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
@@ -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/>.
 */

-AILog.Info("1.1 API compatibility in effect.");
+AILog.Info("1.1 API compatability in effect.");

 AICompany.GetCompanyValue <- function(company)
 {
@@ -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/compat_1.2.nut
+++ b/bin/ai/compat_1.2.nut
@@ -6,5 +6,3 @@
 * 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/>.
 */
-
-AILog.Info("1.2 API compatibility in effect.");
--- a/bin/ai/compat_1.3.nut
+++ b/bin/ai/compat_1.3.nut
@@ -1,10 +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/>.
- */
-
-AILog.Info("1.3 API compatibility in effect.");
--- a/bin/ai/compat_1.4.nut
+++ b/bin/ai/compat_1.4.nut
@@ -1,10 +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/>.
- */
-
-AILog.Info("1.4 API compatibility in effect.");
--- a/bin/ai/compat_1.5.nut
+++ b/bin/ai/compat_1.5.nut
@@ -1,10 +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/>.
- */
-
-AILog.Info("1.5 API compatibility in effect.");
--- a/bin/ai/compat_1.6.nut
+++ b/bin/ai/compat_1.6.nut
@@ -1,10 +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/>.
- */
-
-AILog.Info("1.6 API compatibility in effect.");
--- a/bin/ai/compat_1.7.nut
+++ b/bin/ai/compat_1.7.nut
@@ -1,10 +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/>.
- */
-
-AILog.Info("1.7 API compatibility in effect.");
--- a/bin/ai/compat_1.8.nut
+++ b/bin/ai/compat_1.8.nut
@@ -1,8 +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/>.
- */
--- a/bin/ai/regression/completeness.sh
+++ b/bin/ai/regression/completeness.sh
@@ -2,12 +2,12 @@

 # $Id$

-if ! [ -f ai/regression/completeness.sh ]; then
+if ! [ -f ai/regression/regression.nut ]; then
 	echo "Make sure you are in the root of OpenTTD before starting this script."
 	exit 1
 fi

-cat ai/regression/tst_*/main.nut | tr ';' '\n' | awk '
+cat ai/regression/regression.nut | tr ';' '\n' | awk '
 /^function/ {
 	for (local in locals) {
 		delete locals[local]
@@ -61,7 +61,7 @@ cat ai/regression/tst_*/main.nut | tr ';' '\n' | awk '
 }
 ' | sed 's/	//g' | sort | uniq > tmp.in_regression

-grep 'DefSQ.*Method' ../src/script/api/ai/*.hpp.sq | grep -v 'AIError::' | grep -v 'AIAbstractList::Valuate' | grep -v '::GetClassName' | sed 's/^[^,]*, &//g;s/,[^,]*//g' | sort > tmp.in_api
+grep 'DefSQ.*Method' ../src/ai/api/*.hpp.sq | grep -v 'AIError::' | grep -v 'AIAbstractList::Valuate' | grep -v '::GetClassName' | sed 's/^[^,]*, &//g;s/,[^,]*//g' | sort > tmp.in_api

 diff -u tmp.in_regression tmp.in_api | grep -v '^+++' | grep '^+' | sed 's/^+//'

--- a/bin/ai/regression/tst_regression/main.nut
+++ b/bin/ai/regression/tst_regression/main.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,18 +961,59 @@ 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));
 	print("  GetStopLocation():     " + AIOrder.GetStopLocation(20, 0));

-	local list = AIVehicleList_Station(3);
+	local list = AIStationList_Vehicle(12);
+
+	print("");
+	print("--StationList_Vehicle--");
+	print("  Count():             " + list.Count());
+	list.Valuate(AIStation.GetLocation);
+	print("  Location ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.GetCargoWaiting, 0);
+	print("  CargoWaiting(0) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.GetCargoWaiting, 1);
+	print("  CargoWaiting(1) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.GetCargoRating, 1);
+	print("  CargoRating(1) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.GetDistanceManhattanToTile, 30000);
+	print("  DistanceManhattanToTile(30000) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.GetDistanceSquareToTile, 30000);
+	print("  DistanceSquareToTile(30000) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.IsWithinTownInfluence, 0);
+	print("  IsWithinTownInfluence(0) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+
+	list = AIVehicleList_Station(3);

 	print("");
 	print("--VehicleList_Station--");
@@ -1193,6 +1234,10 @@ function Regression::Station()
 	print("  GetLocation(1000):        " + AIStation.GetLocation(1000));
 	print("  GetStationID(33411):      " + AIStation.GetStationID(33411));
 	print("  GetStationID(34411):      " + AIStation.GetStationID(34411));
+	print("  GetCargoWaiting(0, 0):    " + AIStation.GetCargoWaiting(0, 0));
+	print("  GetCargoWaiting(1000, 0): " + AIStation.GetCargoWaiting(1000, 0));
+	print("  GetCargoWaiting(0, 1000): " + AIStation.GetCargoWaiting(0, 1000));
+
 	print("  GetStationID(33411):      " + AIStation.GetStationID(33411));
 	print("  HasRoadType(3, TRAM):     " + AIStation.HasRoadType(3, AIRoad.ROADTYPE_TRAM));
 	print("  HasRoadType(3, ROAD):     " + AIStation.HasRoadType(3, AIRoad.ROADTYPE_ROAD));
@@ -1209,42 +1254,25 @@ function Regression::Station()
 	print("  GetNearestTown():         " + AIStation.GetNearestTown(10000));
 	print("  GetNearestTown():         " + AIStation.GetNearestTown(3));

-	print("");
-	print("--CargoWaiting--");
-	for (local cargo = 0; cargo <= 1000; cargo += 1000) {
-		for (local station0 = 0; station0 <= 1000; station0 += 1000) {
-			print("  GetCargoWaiting(" + station0 + ", " + cargo + "): " +
-					AIStation.GetCargoWaiting(station0, cargo));
-			for (local station1 = 0; station1 <= 1000; station1 += 1000) {
-				print("  GetCargoWaitingFrom(" + station0 + ", " + station1 + ", " + cargo + "): " +
-						AIStation.GetCargoWaitingFrom(station0, station1, cargo));
-				print("  GetCargoWaitingVia(" + station0 + ", " + station1 + ", " + cargo + "): " +
-						AIStation.GetCargoWaitingFrom(station0, station1, cargo));
-				for (local station2 = 0; station2 <= 1000; station2 += 1000) {
-					print("  GetCargoWaitingFromVia(" + station0 + ", " + station1 + ", " + station2 + ", " + cargo + "): " +
-							AIStation.GetCargoWaitingFromVia(station0, station1, station2, cargo));
-				}
-			}
-		}
-	}
+	local list = AIStationList(AIStation.STATION_BUS_STOP + AIStation.STATION_TRUCK_STOP);

 	print("");
-	print("--CargoPlanned--");
-	for (local cargo = 0; cargo <= 1000; cargo += 1000) {
-		for (local station0 = 0; station0 <= 1000; station0 += 1000) {
-			print("  GetCargoPlanned(" + station0 + ", " + cargo + "): " +
-					AIStation.GetCargoPlanned(station0, cargo));
-			for (local station1 = 0; station1 <= 1000; station1 += 1000) {
-				print("  GetCargoPlannedFrom(" + station0 + ", " + station1 + ", " + cargo + "): " +
-						AIStation.GetCargoPlannedFrom(station0, station1, cargo));
-				print("  GetCargoPlannedVia(" + station0 + ", " + station1 + ", " + cargo + "): " +
-						AIStation.GetCargoPlannedFrom(station0, station1, cargo));
-				for (local station2 = 0; station2 <= 1000; station2 += 1000) {
-					print("  GetCargoPlannedFromVia(" + station0 + ", " + station1 + ", " + station2 + ", " + cargo + "): " +
-							AIStation.GetCargoPlannedFromVia(station0, station1, station2, cargo));
-				}
-			}
-		}
+	print("--StationList--");
+	print("  Count():             " + list.Count());
+	list.Valuate(AIStation.GetLocation);
+	print("  Location ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.GetCargoWaiting, 0);
+	print("  CargoWaiting(0) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	list.Valuate(AIStation.GetCargoWaiting, 1);
+	print("  CargoWaiting(1) ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
 	}
 }

--- a/bin/ai/regression/regression.sav
+++ b/bin/ai/regression/regression.sav
--- a/bin/ai/regression/tst_regression/result.txt
+++ b/bin/ai/regression/tst_regression/result.txt
@@ -88,9 +88,9 @@
 abs( 21): 21

 --AIBase--
-  Rand():       -54346916
-  Rand():       -937374575
-  Rand():       823953997
+  Rand():       1259692483
+  Rand():       -1289244298
+  Rand():       -1572996668
  RandRange(0): 0
  RandRange(0): 0
  RandRange(0): 0
@@ -98,12 +98,12 @@
  RandRange(1): 0
  RandRange(1): 0
  RandRange(2): 1
+  RandRange(2): 0
  RandRange(2): 1
-  RandRange(2): 1
-  RandRange(1000000): 966676
-  RandRange(1000000): 289525
-  RandRange(1000000): 170283
-  Chance(1, 2): false
+  RandRange(1000000): 36500
+  RandRange(1000000): 300101
+  RandRange(1000000): 418369
+  Chance(1, 2): true
  Chance(1, 2): true
  Chance(1, 2): false

@@ -420,144 +420,144 @@
    1098 => 46116
    1099 => 46158
  Randomize ListDump:
-    1 => -200078348
-    2 => -29799264
-    1000 => 1630721656
-    1001 => 959306175
-    1002 => 1527421791
-    1003 => 1259692483
-    1004 => -1289244298
-    1005 => -1572996668
-    1006 => -2069479746
-    1007 => -1819131606
-    1008 => -1007163964
-    1009 => -1185394870
-    1010 => -1471365065
-    1011 => 364354366
-    1012 => -1478084253
-    1013 => 405281367
-    1014 => -11170062
-    1015 => 156767750
-    1016 => 1288924796
-    1017 => 1796884876
-    1018 => -1947073702
-    1019 => -1999614238
-    1020 => -231292809
-    1021 => 966621566
-    1022 => -606766557
-    1023 => -1138727825
-    1024 => -749544262
-    1025 => 2004771271
-    1026 => 686734186
-    1027 => 923274744
-    1028 => -1672035149
-    1029 => -1642064950
-    1030 => 1363389551
-    1031 => -559500928
-    1032 => 1656196991
-    1033 => 1655354425
-    1034 => -1027156689
-    1035 => 1952644328
-    1036 => 1217870217
-    1037 => 242274100
-    1038 => 201816080
-    1039 => 2127464758
-    1040 => 446043650
-    1041 => -319728455
-    1042 => 204701002
-    1043 => -571265398
-    1044 => -1422217131
-    1045 => -391208397
-    1046 => -1822628371
-    1047 => -1499755350
-    1048 => -1422137641
-    1049 => 1621693134
-    1051 => -1428728134
-    1052 => -147587573
-    1053 => 681719500
-    1054 => 1172011190
-    1055 => -1834344882
-    1056 => 1157634586
-    1057 => 1902133676
-    1058 => -1967780161
-    1059 => -1618025531
-    1060 => -810220453
-    1061 => 1582854921
-    1062 => -410004643
-    1063 => 1159917159
-    1064 => -1377804984
-    1065 => -738843914
-    1066 => -1578756103
-    1067 => -464090986
-    1068 => 1711504679
-    1069 => 545330655
-    1070 => 379462570
-    1071 => 514511099
-    1072 => -1813251176
-    1073 => 1424958266
-    1074 => -825255131
-    1075 => 539054595
-    1076 => -1764192010
-    1077 => -1243277769
-    1078 => 2017874281
-    1079 => -1972353607
-    1080 => 1879761467
-    1081 => 1638986560
-    1082 => -1832287507
-    1083 => -492411882
-    1084 => 658940812
-    1085 => -1044199400
-    1086 => 1586504918
-    1087 => -125492611
-    1088 => -1562883174
-    1089 => -1013778441
-    1090 => 1560228607
-    1091 => -550265689
-    1092 => 524767105
-    1093 => -713387661
-    1094 => 1425927738
-    1095 => 942653932
-    1096 => 1233220698
-    1097 => 1313602368
-    1098 => -140318584
-    1099 => 1199179892
+    1 => 966621566
+    2 => -606766557
+    1000 => -1138727825
+    1001 => -749544262
+    1002 => 2004771271
+    1003 => 686734186
+    1004 => 923274744
+    1005 => -1672035149
+    1006 => -1642064950
+    1007 => 1363389551
+    1008 => -559500928
+    1009 => 1656196991
+    1010 => 1655354425
+    1011 => -1027156689
+    1012 => 1952644328
+    1013 => 1217870217
+    1014 => 242274100
+    1015 => 201816080
+    1016 => 2127464758
+    1017 => 446043650
+    1018 => -319728455
+    1019 => 204701002
+    1020 => -571265398
+    1021 => -1422217131
+    1022 => -391208397
+    1023 => -1822628371
+    1024 => -1499755350
+    1025 => -1422137641
+    1026 => 1621693134
+    1027 => -1428728134
+    1028 => -147587573
+    1029 => 681719500
+    1030 => 1172011190
+    1031 => -1834344882
+    1032 => 1157634586
+    1033 => 1902133676
+    1034 => -1967780161
+    1035 => -1618025531
+    1036 => -810220453
+    1037 => 1582854921
+    1038 => -410004643
+    1039 => 1159917159
+    1040 => -1377804984
+    1041 => -738843914
+    1042 => -1578756103
+    1043 => -464090986
+    1044 => 1711504679
+    1045 => 545330655
+    1046 => 379462570
+    1047 => 514511099
+    1048 => -1813251176
+    1049 => 1424958266
+    1051 => -825255131
+    1052 => 539054595
+    1053 => -1764192010
+    1054 => -1243277769
+    1055 => 2017874281
+    1056 => -1972353607
+    1057 => 1879761467
+    1058 => 1638986560
+    1059 => -1832287507
+    1060 => -492411882
+    1061 => 658940812
+    1062 => -1044199400
+    1063 => 1586504918
+    1064 => -125492611
+    1065 => -1562883174
+    1066 => -1013778441
+    1067 => 1560228607
+    1068 => -550265689
+    1069 => 524767105
+    1070 => -713387661
+    1071 => 1425927738
+    1072 => 942653932
+    1073 => 1233220698
+    1074 => 1313602368
+    1075 => -140318584
+    1076 => 1199179892
+    1077 => 91450916
+    1078 => -1471626821
+    1079 => -552692855
+    1080 => -801295697
+    1081 => 1307607393
+    1082 => -2111765574
+    1083 => 1773729008
+    1084 => -81987003
+    1085 => -1090790034
+    1086 => -843700327
+    1087 => -1306436740
+    1088 => 735656985
+    1089 => -1933491876
+    1090 => 642759863
+    1091 => 255293949
+    1092 => -1052469001
+    1093 => -1043605053
+    1094 => -2080328201
+    1095 => -1825196581
+    1096 => -1789181164
+    1097 => -1636072563
+    1098 => -111321262
+    1099 => 1979741000
  KeepTop(10):
-    1 => -200078348
-    2 => -29799264
-    1000 => 1630721656
-    1001 => 959306175
-    1002 => 1527421791
-    1003 => 1259692483
-    1004 => -1289244298
-    1005 => -1572996668
-    1006 => -2069479746
-    1007 => -1819131606
+    1 => 966621566
+    2 => -606766557
+    1000 => -1138727825
+    1001 => -749544262
+    1002 => 2004771271
+    1003 => 686734186
+    1004 => 923274744
+    1005 => -1672035149
+    1006 => -1642064950
+    1007 => 1363389551
  KeepBottom(8):
-    1000 => 1630721656
-    1001 => 959306175
-    1002 => 1527421791
-    1003 => 1259692483
-    1004 => -1289244298
-    1005 => -1572996668
-    1006 => -2069479746
-    1007 => -1819131606
+    1000 => -1138727825
+    1001 => -749544262
+    1002 => 2004771271
+    1003 => 686734186
+    1004 => 923274744
+    1005 => -1672035149
+    1006 => -1642064950
+    1007 => 1363389551
  RemoveBottom(2):
-    1000 => 1630721656
-    1001 => 959306175
-    1002 => 1527421791
-    1003 => 1259692483
-    1004 => -1289244298
-    1005 => -1572996668
+    1000 => -1138727825
+    1001 => -749544262
+    1002 => 2004771271
+    1003 => 686734186
+    1004 => 923274744
+    1005 => -1672035149
  RemoveTop(2):
-    1002 => 1527421791
-    1003 => 1259692483
-    1004 => -1289244298
-    1005 => -1572996668
+    1002 => 2004771271
+    1003 => 686734186
+    1004 => 923274744
+    1005 => -1672035149
  RemoveList({1003, 1004}):
-    1002 => 1527421791
-    1005 => -1572996668
+    1002 => 2004771271
+    1005 => -1672035149
  KeepList({1003, 1004, 1005}):
-    1005 => -1572996668
+    1005 => -1672035149
  AddList({1005, 4000, 4001, 4002}):
    1005 => 1005
    4000 => 8000
@@ -588,7 +588,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
  SetName():            false
  GetLastErrorString(): ERR_NAME_IS_NOT_UNIQUE
  GetName():                         Regression
-  GetPresidentName():                E. McAlpine
+  GetPresidentName():                I. McAlpine
  SetPresidentName():                true
  GetPresidentName():                Regression AI
  GetBankBalance():                  100000
@@ -877,7 +877,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
    GetName():          Wooden rail bridge
    GetMaxSpeed():      32
    GetPrice():         450
-    GetMaxLength():     66
+    GetMaxLength():     102
    GetMinLength():     2
  Bridge 1
    IsValidBridge():    true
@@ -905,14 +905,14 @@ ERROR: IsEnd() is invalid as Begin() is never called
    GetName():          Steel suspension rail bridge
    GetMaxSpeed():      96
    GetPrice():         1042
-    GetMaxLength():     66
+    GetMaxLength():     102
    GetMinLength():     5
  Bridge 5
    IsValidBridge():    true
    GetName():          Steel suspension rail bridge
    GetMaxSpeed():      112
    GetPrice():         1081
-    GetMaxLength():     66
+    GetMaxLength():     102
    GetMinLength():     5
  Bridge 6
    IsValidBridge():    true
@@ -1012,9 +1012,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
    1 => 630
    0 => 450
  MaxLength ListDump:
-    5 => 66
-    4 => 66
-    0 => 66
+    5 => 102
+    4 => 102
+    0 => 102
    3 => 12
    8 => 11
    7 => 10
@@ -5079,7 +5079,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
    GetPlaneType():     -1
  Engine 211
    IsValidEngine():    true
-    GetName():          Yate Cargo Ship
+    GetName():          Yate Cargo ship
    GetCargoType():     5
    CanRefitCargo():    true
    GetCapacity():      160
@@ -7384,7 +7384,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
    HasRoadType(Road):             true
    HasRoadType(Tram):             false
    GetNeighbourRoadCount():       2
-    RemoveRoad():                  false
+    RemoveRoad():                  true
    RemoveRoad():                  true
    RemoveRoad():                  false
    RemoveRoad():                  true
@@ -7487,6 +7487,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
  GetLocation(1000):        -1
  GetStationID(33411):      4
  GetStationID(34411):      65535
+  GetCargoWaiting(0, 0):    0
+  GetCargoWaiting(1000, 0): -1
+  GetCargoWaiting(0, 1000): -1
  GetStationID(33411):      4
  HasRoadType(3, TRAM):     false
  HasRoadType(3, ROAD):     false
@@ -7501,81 +7504,17 @@ ERROR: IsEnd() is invalid as Begin() is never called
  GetNearestTown():         65535
  GetNearestTown():         10

--CargoWaiting--
-  GetCargoWaiting(0, 0): 0
-  GetCargoWaitingFrom(0, 0, 0): 0
-  GetCargoWaitingVia(0, 0, 0): 0
-  GetCargoWaitingFromVia(0, 0, 0, 0): 0
-  GetCargoWaitingFromVia(0, 0, 1000, 0): -1
-  GetCargoWaitingFrom(0, 1000, 0): -1
-  GetCargoWaitingVia(0, 1000, 0): -1
-  GetCargoWaitingFromVia(0, 1000, 0, 0): -1
-  GetCargoWaitingFromVia(0, 1000, 1000, 0): -1
-  GetCargoWaiting(1000, 0): -1
-  GetCargoWaitingFrom(1000, 0, 0): -1
-  GetCargoWaitingVia(1000, 0, 0): -1
-  GetCargoWaitingFromVia(1000, 0, 0, 0): -1
-  GetCargoWaitingFromVia(1000, 0, 1000, 0): -1
-  GetCargoWaitingFrom(1000, 1000, 0): -1
-  GetCargoWaitingVia(1000, 1000, 0): -1
-  GetCargoWaitingFromVia(1000, 1000, 0, 0): -1
-  GetCargoWaitingFromVia(1000, 1000, 1000, 0): -1
-  GetCargoWaiting(0, 1000): -1
-  GetCargoWaitingFrom(0, 0, 1000): -1
-  GetCargoWaitingVia(0, 0, 1000): -1
-  GetCargoWaitingFromVia(0, 0, 0, 1000): -1
-  GetCargoWaitingFromVia(0, 0, 1000, 1000): -1
-  GetCargoWaitingFrom(0, 1000, 1000): -1
-  GetCargoWaitingVia(0, 1000, 1000): -1
-  GetCargoWaitingFromVia(0, 1000, 0, 1000): -1
-  GetCargoWaitingFromVia(0, 1000, 1000, 1000): -1
-  GetCargoWaiting(1000, 1000): -1
-  GetCargoWaitingFrom(1000, 0, 1000): -1
-  GetCargoWaitingVia(1000, 0, 1000): -1
-  GetCargoWaitingFromVia(1000, 0, 0, 1000): -1
-  GetCargoWaitingFromVia(1000, 0, 1000, 1000): -1
-  GetCargoWaitingFrom(1000, 1000, 1000): -1
-  GetCargoWaitingVia(1000, 1000, 1000): -1
-  GetCargoWaitingFromVia(1000, 1000, 0, 1000): -1
-  GetCargoWaitingFromVia(1000, 1000, 1000, 1000): -1
-
--CargoPlanned--
-  GetCargoPlanned(0, 0): 0
-  GetCargoPlannedFrom(0, 0, 0): 0
-  GetCargoPlannedVia(0, 0, 0): 0
-  GetCargoPlannedFromVia(0, 0, 0, 0): 0
-  GetCargoPlannedFromVia(0, 0, 1000, 0): -1
-  GetCargoPlannedFrom(0, 1000, 0): -1
-  GetCargoPlannedVia(0, 1000, 0): -1
-  GetCargoPlannedFromVia(0, 1000, 0, 0): -1
-  GetCargoPlannedFromVia(0, 1000, 1000, 0): -1
-  GetCargoPlanned(1000, 0): -1
-  GetCargoPlannedFrom(1000, 0, 0): -1
-  GetCargoPlannedVia(1000, 0, 0): -1
-  GetCargoPlannedFromVia(1000, 0, 0, 0): -1
-  GetCargoPlannedFromVia(1000, 0, 1000, 0): -1
-  GetCargoPlannedFrom(1000, 1000, 0): -1
-  GetCargoPlannedVia(1000, 1000, 0): -1
-  GetCargoPlannedFromVia(1000, 1000, 0, 0): -1
-  GetCargoPlannedFromVia(1000, 1000, 1000, 0): -1
-  GetCargoPlanned(0, 1000): -1
-  GetCargoPlannedFrom(0, 0, 1000): -1
-  GetCargoPlannedVia(0, 0, 1000): -1
-  GetCargoPlannedFromVia(0, 0, 0, 1000): -1
-  GetCargoPlannedFromVia(0, 0, 1000, 1000): -1
-  GetCargoPlannedFrom(0, 1000, 1000): -1
-  GetCargoPlannedVia(0, 1000, 1000): -1
-  GetCargoPlannedFromVia(0, 1000, 0, 1000): -1
-  GetCargoPlannedFromVia(0, 1000, 1000, 1000): -1
-  GetCargoPlanned(1000, 1000): -1
-  GetCargoPlannedFrom(1000, 0, 1000): -1
-  GetCargoPlannedVia(1000, 0, 1000): -1
-  GetCargoPlannedFromVia(1000, 0, 0, 1000): -1
-  GetCargoPlannedFromVia(1000, 0, 1000, 1000): -1
-  GetCargoPlannedFrom(1000, 1000, 1000): -1
-  GetCargoPlannedVia(1000, 1000, 1000): -1
-  GetCargoPlannedFromVia(1000, 1000, 0, 1000): -1
-  GetCargoPlannedFromVia(1000, 1000, 1000, 1000): -1
+--StationList--
+  Count():             2
+  Location ListDump:
+    5 => 33421
+    4 => 33411
+  CargoWaiting(0) ListDump:
+    5 => 0
+    4 => 0
+  CargoWaiting(1) ListDump:
+    5 => 0
+    4 => 0

 --Tile--
  HasTreeOnTile():      false
@@ -9012,7 +8951,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
  GetWagonEngineType(): 27
  GetWagonAge():        1
  GetWagonEngineType(): 27
-  GetWagonAge():        0
+  GetWagonAge():        1
  GetWagonEngineType(): 65535
  GetWagonAge():        -1
  --Errors--
@@ -9167,6 +9106,30 @@ ERROR: IsEnd() is invalid as Begin() is never called
  SetStopLocation():     true
  GetStopLocation():     1

+--StationList_Vehicle--
+  Count():             2
+  Location ListDump:
+    5 => 33421
+    4 => 33411
+  CargoWaiting(0) ListDump:
+    5 => 0
+    4 => 0
+  CargoWaiting(1) ListDump:
+    5 => 0
+    4 => 0
+  CargoRating(1) ListDump:
+    5 => 69
+    4 => 69
+  DistanceManhattanToTile(30000) ListDump:
+    5 => 106
+    4 => 96
+  DistanceSquareToTile(30000) ListDump:
+    5 => 8818
+    4 => 7058
+  IsWithinTownInfluence(0) ListDump:
+    5 => 0
+    4 => 0
+
 --VehicleList_Station--
  Count():             1
  Location ListDump:
@@ -9185,6 +9148,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
        GetDestinationType():  1
        GetDestinationIndex(): 7
        GetCargoType():        0
+  GetNextEvent:          instance
+    GetEventType:        6
+      Unknown Event
  IsEventWaiting:        false

 --Math--
--- a/bin/ai/regression/regression_info.nut
+++ b/bin/ai/regression/regression_info.nut
@@ -4,9 +4,9 @@ class Regression extends AIInfo {
 	function GetAuthor()      { return "OpenTTD NoAI Developers Team"; }
 	function GetName()        { return "Regression"; }
 	function GetShortName()   { return "REGR"; }
-	function GetDescription() { return "This runs regression-tests on some commands. On the same map the result should always be the same."; }
+	function GetDescription() { return "This runs regression-tests on all commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "1.8"; }
+	function GetAPIVersion()  { return "1.2"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 }
--- a/bin/ai/regression/tst_regression/require.nut
+++ b/bin/ai/regression/tst_regression/require.nut
--- a/bin/ai/regression/run.sh
+++ b/bin/ai/regression/run.sh
@@ -2,11 +2,14 @@

 # $Id$

-if ! [ -f ai/regression/run.sh ]; then
+if ! [ -f ai/regression/regression.nut ]; then
 	echo "Make sure you are in the root of OpenTTD before starting this script."
 	exit 1
 fi

+cp ai/regression/regression.nut ai/regression/main.nut
+cp ai/regression/regression_info.nut ai/regression/info.nut
+
 if [ -f scripts/game_start.scr ]; then
 	mv scripts/game_start.scr scripts/game_start.scr.regression
 fi
@@ -19,46 +22,27 @@ fi
 if [ "$1" = "-g" ]; then
 	gdb="gdb --ex run --args "
 fi
-
-if [ -d "ai/regression/tst_$1" ]; then
-	tests="ai/regression/tst_$1"
-elif [ -d "ai/regression/tst_$2" ]; then
-	tests="ai/regression/tst_$2"
+if [ -n "$gdb" ]; then
+	$gdb ./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav
 else
-	tests=ai/regression/tst_*
+	./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
 fi

 ret=0
-for tst in $tests; do
-	echo -n "Running $tst... "
-
-	# Make sure that only one info.nut is present for each test run. Otherwise openttd gets confused.
-	cp ai/regression/regression_info.nut $tst/info.nut
-
-	sav=$tst/test.sav
-	if ! [ -f $sav ]; then
-		sav=ai/regression/empty.sav
-	fi
-
-	if [ -n "$gdb" ]; then
-		$gdb ./openttd -x -c ai/regression/regression.cfg $params -g $sav
+if [ -z "$gdb" ]; then
+	res="`diff -ub ai/regression/regression.txt tmp.regression`"
+	if [ -z "$res" ]; then
+		echo "Regression test passed!"
 	else
-		./openttd -x -c ai/regression/regression.cfg $params -g $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
+		echo "Regression test failed! Difference:"
+		echo "$res"
+		ret=1
 	fi
+	echo ""
+	echo "Regression test done"
+fi

-	if [ -z "$gdb" ]; then
-		res="`diff -ub $tst/result.txt tmp.regression`"
-		if [ -z "$res" ]; then
-			echo "passed!"
-		else
-			echo "failed! Difference:"
-			echo "$res"
-			ret=1
-		fi
-	fi
-
-	rm $tst/info.nut
-done
+rm -f ai/regression/main.nut ai/regression/info.nut

 if [ -f scripts/game_start.scr.regression ]; then
 	mv scripts/game_start.scr.regression scripts/game_start.scr
--- a/bin/ai/regression/tst_stationlist/main.nut
+++ b/bin/ai/regression/tst_stationlist/main.nut
@@ -1,216 +0,0 @@
-/* $Id$ */
-
-class Regression extends AIController {
-	function Start();
-};
-
-
-function Regression::StationList()
-{
-	local list = AIStationList(AIStation.STATION_BUS_STOP + AIStation.STATION_TRUCK_STOP);
-
-	print("");
-	print("--StationList--");
-	print("  Count():             " + list.Count());
-	list.Valuate(AIStation.GetLocation);
-	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetCargoWaiting, 0);
-	print("  CargoWaiting(0) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetCargoWaiting, 1);
-	print("  CargoWaiting(1) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_Cargo()
-{
-	print("");
-	print("--StationList_Cargo--");
-
-	for (local mode = AIStationList_Cargo.CM_WAITING; mode <= AIStationList_Cargo.CM_PLANNED; ++mode) {
-		print("  " + mode);
-		for (local selector = AIStationList_Cargo.CS_BY_FROM; selector <= AIStationList_Cargo.CS_FROM_BY_VIA ; ++selector) {
-			print("    " + selector);
-			local list = AIStationList_Cargo(mode, selector, 6, 0, 7);
-			for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-				print("      " + i + " => " + list.GetValue(i));
-			}
-		}
-	}
-};
-
-function Regression::StationList_CargoPlanned()
-{
-	print("");
-	print("--StationList_CargoPlanned--");
-
-	for (local selector = AIStationList_Cargo.CS_BY_FROM; selector <= AIStationList_Cargo.CS_FROM_BY_VIA; ++selector) {
-		print("    " + selector);
-		local list = AIStationList_CargoPlanned(selector, 6, 0, 7);
-		for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-			print("      " + i + " => " + list.GetValue(i));
-		}
-	}
-};
-
-function Regression::StationList_CargoPlannedByFrom()
-{
-	print("");
-	print("--StationList_CargoPlannedByFrom--");
-	local list = AIStationList_CargoPlannedByFrom(2, 0);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_CargoPlannedByVia()
-{
-	print("");
-	print("--StationList_CargoPlannedByVia--");
-	local list = AIStationList_CargoPlannedByVia(2, 0);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_CargoPlannedViaByFrom()
-{
-	print("");
-	print("--StationList_CargoPlannedViaByFrom--");
-	local list = AIStationList_CargoPlannedViaByFrom(6, 0, 7);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_CargoPlannedFromByVia()
-{
-	print("");
-	print("--StationList_CargoPlannedFromByVia--");
-	local list = AIStationList_CargoPlannedFromByVia(6, 0, 7);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_CargoWaiting()
-{
-	print("");
-	print("--StationList_CargoWaiting--");
-
-	for (local selector = AIStationList_Cargo.CS_BY_FROM; selector <= AIStationList_Cargo.CS_FROM_BY_VIA; ++selector) {
-		print("    " + selector);
-		local list = AIStationList_CargoWaiting(selector, 6, 0, 7);
-		for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-			print("      " + i + " => " + list.GetValue(i));
-		}
-	}
-};
-
-function Regression::StationList_CargoWaitingByFrom()
-{
-	print("");
-	print("--StationList_CargoWaitingByFrom--");
-	local list = AIStationList_CargoWaitingByFrom(2, 0);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_CargoWaitingByVia()
-{
-	print("");
-	print("--StationList_CargoWaitingByVia--");
-	local list = AIStationList_CargoWaitingByVia(2, 0);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_CargoWaitingViaByFrom()
-{
-	print("");
-	print("--StationList_CargoWaitingViaByFrom--");
-	local list = AIStationList_CargoWaitingViaByFrom(6, 0, 7);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_CargoWaitingFromByVia()
-{
-	print("");
-	print("--StationList_CargoWaitingFromByVia--");
-	local list = AIStationList_CargoWaitingFromByVia(2, 0, 2);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_Vehicle()
-{
-	local list = AIStationList_Vehicle(12);
-
-	print("");
-	print("--StationList_Vehicle--");
-	print("  Count():             " + list.Count());
-	list.Valuate(AIStation.GetLocation);
-	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetCargoWaiting, 0);
-	print("  CargoWaiting(0) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetCargoWaiting, 1);
-	print("  CargoWaiting(1) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetCargoRating, 1);
-	print("  CargoRating(1) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetDistanceManhattanToTile, 30000);
-	print("  DistanceManhattanToTile(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetDistanceSquareToTile, 30000);
-	print("  DistanceSquareToTile(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.IsWithinTownInfluence, 0);
-	print("  IsWithinTownInfluence(0) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-}
-
-function Regression::Start()
-{
-	StationList();
-	StationList_Cargo();
-	StationList_CargoPlanned();
-	StationList_CargoPlannedByFrom();
-	StationList_CargoPlannedByVia();
-	StationList_CargoPlannedViaByFrom();
-	StationList_CargoPlannedFromByVia();
-	StationList_CargoWaiting();
-	StationList_CargoWaitingByFrom();
-	StationList_CargoWaitingByVia();
-	StationList_CargoWaitingViaByFrom();
-	StationList_CargoWaitingFromByVia();
-	StationList_Vehicle();
-}
--- a/bin/ai/regression/tst_stationlist/result.txt
+++ b/bin/ai/regression/tst_stationlist/result.txt
@@ -1,127 +0,0 @@
-
--StationList--
-  Count():             5
-  Location ListDump:
-    6 => 42341
-    2 => 41831
-    7 => 41825
-    5 => 33421
-    4 => 33411
-  CargoWaiting(0) ListDump:
-    7 => 6
-    6 => 6
-    2 => 3
-    5 => 0
-    4 => 0
-  CargoWaiting(1) ListDump:
-    7 => 0
-    6 => 0
-    5 => 0
-    4 => 0
-    2 => 0
-
--StationList_Cargo--
-  0
-    0
-      6 => 6
-    1
-      6 => 2
-    2
-      2 => 4
-      7 => 2
-    3
-  1
-    0
-      7 => 18
-      6 => 16
-      2 => 7
-    1
-      6 => 8
-      2 => 3
-    2
-      2 => 16
-      6 => 14
-      7 => 11
-    3
-      6 => 10
-      2 => 8
-
--StationList_CargoPlanned--
-    0
-      7 => 18
-      6 => 16
-      2 => 7
-    1
-      6 => 8
-      2 => 3
-    2
-      2 => 16
-      6 => 14
-      7 => 11
-    3
-      6 => 10
-      2 => 8
-
--StationList_CargoPlannedByFrom--
-      7 => 8
-      6 => 8
-      2 => 7
-
--StationList_CargoPlannedByVia--
-      2 => 16
-      6 => 7
-
--StationList_CargoPlannedViaByFrom--
-      6 => 8
-      2 => 3
-
--StationList_CargoPlannedFromByVia--
-      6 => 10
-      2 => 8
-
--StationList_CargoWaiting--
-    0
-      6 => 6
-    1
-      6 => 2
-    2
-      2 => 4
-      7 => 2
-    3
-
--StationList_CargoWaitingByFrom--
-      2 => 3
-
--StationList_CargoWaitingByVia--
-      6 => 3
-
--StationList_CargoWaitingViaByFrom--
-      6 => 2
-
--StationList_CargoWaitingFromByVia--
-      6 => 3
-
--StationList_Vehicle--
-  Count():             2
-  Location ListDump:
-    5 => 33421
-    4 => 33411
-  CargoWaiting(0) ListDump:
-    5 => 0
-    4 => 0
-  CargoWaiting(1) ListDump:
-    5 => 0
-    4 => 0
-  CargoRating(1) ListDump:
-    5 => -1
-    4 => -1
-  DistanceManhattanToTile(30000) ListDump:
-    5 => 106
-    4 => 96
-  DistanceSquareToTile(30000) ListDump:
-    5 => 8818
-    4 => 7058
-  IsWithinTownInfluence(0) ListDump:
-    5 => 0
-    4 => 0
-ERROR: The script died unexpectedly.
--- a/bin/ai/regression/tst_stationlist/test.sav
+++ b/bin/ai/regression/tst_stationlist/test.sav
--- a/bin/baseset/no_music.obm
+++ b/bin/baseset/no_music.obm
@@ -10,56 +10,34 @@ fallback          = true
 description       = A music pack without actual music.
 description.af_ZA = 'n Musiek stel sonder enige musiek.
 description.ar_EG = مجموعة موسيقى بدون موسيقى
-description.be_BY = "Пусты" набор музычнага афармлення, які не зьмяшчае ніякай музыкі.
 description.bg_BG = Празен музикален пакет.
-description.ca_ES = Una llista de música sense cap peça.
+description.ca_ES = Un joc de música sense cap música.
 description.cs_CZ = Prázná hudební sada.
-description.cy_GB = Pecyn cerddoriaeth heb unrhyw gerddoriaeth ynddo.
-description.da_DK = En musikpakke uden musik.
+description.da_DA = En musikpakke uden musik.
 description.de_DE = Ein Musikset ohne Musik.
 description.el_GR = Ένα πάκετο μουσικής χωρίς πραγματική μουσική.
-description.en_AU = A music pack without actual music.
+description.en_GB = A music pack without actual music.
 description.en_US = A music pack without actual music.
 description.es_ES = Un conjunto de música vacío.
-description.es_MX = Paquete de música vacío
-description.et_EE = Muusikakogu ilma muusikata.
-description.eu_ES = Musika gabeko musika paketea.
+description.et_ET = Muusikakomplekt ilma igasuguse muusikata.
 description.fi_FI = Musiikkipaketti, jossa ei ole musiikkia.
 description.fr_FR = Un pack de musiques sans musiques.
-description.ga_IE = Pacáiste ceoil gan aon cheol iarbhír ann.
-description.gd_GB = Pacaid ciùil anns nach eil fonn sam bith.
-description.gl_ES = Un conxunto de músicas sen ningunha música.
-description.he_IL = אוסף מנגינות ללא מנגינות.
-description.hr_HR = Glazbeni paket bez ikakve glazbe.
+description.hr_HR = Muzički paket bez ikakve muzike.
 description.hu_HU = Zenei alapcsomag zene nélkül.
-description.id_ID = Paket musik tanpa musik sungguhan.
-description.is_IS = Tónlistarpakki sem er í raun án tónlistar.
+description.id_ID = Paket musik tanpa berisi musik.
 description.it_IT = Un pacchetto musicale non contenente alcuna musica.
-description.ja_JP = 空の音楽パック
-description.ko_KR = 실제 음악이 없는 음악 목록입니다.
-description.la_VA = Sarcina musicae sine ulla musica.
-description.lb_LU = E Musikpack ouni aktuell Musik.
-description.lt_LT = Muzikos pakas be muzikos.
-description.lv_LV = Mūzikas kopa bez mūzikas
-description.ms_MY = Pek muzik tanpa muzik sebenar.
 description.nb_NO = En musikkpakke uten noe musikk.
 description.nl_NL = Een muziekset zonder muziek.
 description.nn_NO = Ei musikkpakke utan noko musikk.
 description.pl_PL = Zestaw utworów muzycznych nie zawierający żadnej muzyki.
-description.pt_BR = Um pacote de músicas sem músicas.
 description.pt_PT = Um conjunto de música vazio.
 description.ro_RO = Un set de muzică fără muzică inclusă.
 description.ru_RU = "Пустой" набор музыкального оформления, не содержащий никакой музыки.
 description.sk_SK = Sada hudby neobsahujúca hudbu.
-description.sl_SI = Glasbeni paket z vključeno glasbo.
+description.sl_SL = Glasbeni paket z vključeno glasbo.
 description.sr_RS = Prazan skup muzičkih numera.
 description.sv_SE = Ett musikpaket utan någon musik.
-description.ta_IN = இசை இல்லாத இசைத்தொகுப்பு.
-description.th_TH = ชุดเพลงประกอบแบบไม่มีเสียงเพลง
 description.tr_TR = Müzik içermeyen boş bir müzik paketi.
-description.uk_UA = Порожній набір музики.
-description.vi_VN = Gói âm nhạc này không có nhạc nào.
-description.zh_CN = 一个没有实际内容的音乐包.
 description.zh_TW = 不含任何音樂的音樂集。

 [files]
--- a/bin/baseset/no_sound.obs
+++ b/bin/baseset/no_sound.obs
@@ -10,55 +10,34 @@ fallback          = true
 description       = A sound pack without any sounds.
 description.af_ZA = 'n Klank stel sonder enige klanke.
 description.ar_EG = مجموعة صوت بدوت اصوات مضافة
-description.be_BY = "Пусты" набор гукавога афармленьня, які не зьмяшчае ніякіх гукаў.
 description.bg_BG = Празен звуков пакет.
-description.ca_ES = Una llista de sons buida.
+description.ca_ES = Un joc de sons sense cap so.
 description.cs_CZ = Prázdná sada zvuků.
-description.cy_GB = Pecyn sain heb unrhyw effeithiau sain ynddo.
-description.da_DK = En lydpakke uden lyde.
+description.da_DA = En lydpakke uden lyde.
 description.de_DE = Basissounds ohne Sound.
 description.el_GR = Ένα πάκετο ήχων χώρις ήχους.
-description.en_AU = A sound pack without any sounds.
+description.en_GB = A sound pack without any sounds.
 description.en_US = A sound pack without any sounds.
 description.es_ES = Un conjunto de sonidos vacío.
-description.es_MX = Paquete de sonidos vacío
-description.et_EE = Helikogu ilma helideta.
-description.eu_ES = Soinurik gabeko soinu pakete bat
-description.fi_FI = Äänipaketti, jossa ei ole ääniä.
+description.et_ET = Ilma häälteta helipakk.
+description.fi_FI = Äänipaketti ilman ääniä.
 description.fr_FR = Un pack de sons sans sons.
-description.ga_IE = Pacáiste fuaimeanna gan aon fhuaimeanna ann.
-description.gd_GB = Pacaid fhuaimean anns nach eil fuaim sam bith.
-description.gl_ES = Un conxunto de sons sen ningún son
-description.he_IL = אוסף צלילים ללא צלילים.
 description.hr_HR = Zvučni paket bez ikakvih zvukova.
 description.hu_HU = Hang alapcsomag hangok nélkül.
-description.id_ID = Paket efek suara tanpa suara apapun.
-description.is_IS = Hljóðpakki án hljóðs.
+description.id_ID = Paket efek suara tanpa berisi suara.
 description.it_IT = Un pacchetto sonoro non contenente alcun suono.
-description.ja_JP = 空の効果音パック
-description.ko_KR = 아무런 효과음도 없는 효과음 팩입니다.
-description.la_VA = Sarcina sonorum sine ullis sonis.
-description.lb_LU = E Soundpack ouni iergendee Sound.
-description.lt_LT = Garsų pakas be jokių garsų.
-description.lv_LV = Skaņu kopa bez skaņas.
 description.nb_NO = En lydpakke uten noen lyder.
 description.nl_NL = Een geluidset zonder geluid.
 description.nn_NO = Ei lydpakke utan nokon lydar.
 description.pl_PL = Zestaw dźwięków nie zawierający żadnych dźwięków.
-description.pt_BR = Um pacote de sons sem sons.
 description.pt_PT = Um conjunto de sons vazio.
 description.ro_RO = Un set de sunete fără nici un sunet inclus.
 description.ru_RU = "Пустой" набор звукового оформления, не содержащий никаких звуков.
 description.sk_SK = Zvuková sada neobsahujúca zvuky.
-description.sl_SI = Zvočni paket brez zvoka.
+description.sl_SL = Zvočni paket brez zvoka.
 description.sr_RS = Prazan skup zvukova.
 description.sv_SE = Ett ljudpaket utan några ljud.
-description.ta_IN = ஒலிகள் இல்லாத ஒலி தொகுப்பு.
-description.th_TH = ชุดเสียงแบบไร้เสียง
 description.tr_TR = Ses içermeyen boş bir ses kümesi.
-description.uk_UA = Порожній набір звуків.
-description.vi_VN = Gói âm thanh này không có âm thanh nào.
-description.zh_CN = 一个空的音效包.
 description.zh_TW = 不含任何音效的音效集。

 [files]
--- 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
@@ -11,74 +11,52 @@ palette           = DOS
 description       = Original Transport Tycoon Deluxe DOS edition graphics.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe grafieke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة الدوس
-description.be_BY = Арыґінальная ґрафіка з Transport Tycoon Deluxe для DOS.
 description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS.
-description.ca_ES = Gràfics originals del Transport Tycoon Deluxe pel DOS.
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS.
 description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro DOS).
-description.cy_GB = Graffeg gwreiddiol fersiwn DOS o Transport Tycoon Deluxe.
-description.da_DK = Originalgrafik fra Transport Tycoon Deluxe DOS-version.
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe DOS-version.
 description.de_DE = Original Transport Tycoon Deluxe DOS Basisgrafiken.
 description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση DOS.
-description.en_AU = Original Transport Tycoon Deluxe DOS edition graphics.
+description.en_GB = Original Transport Tycoon Deluxe DOS edition graphics.
 description.en_US = Original Transport Tycoon Deluxe DOS edition graphics.
 description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión DOS.
-description.es_MX = Gráficos originales de Transport Tycoon Deluxe para DOS.
-description.et_EE = Algse Transport Tycoon Deluxe DOSi versiooni graafika.
-description.eu_ES = Transport Tycoon Deluxe originaleko DOS edizioko grafikoak.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxen DOS-version grafiikat.
+description.et_ET = Algse Transport Tycoon Deluxe DOSi versiooni graafika.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS grafiikat.
 description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS).
-description.ga_IE = Grafaicí bunaidhTransport Tycoon Deluxe, eagrán DOS.
-description.gd_GB = Grafaigeachd aig an deasachadh DOS tùsail aig Transport Tycoon Deluxe.
-description.gl_ES = Graficos da edición orixinal de Transport Tycoon Deluxe para DOS.
-description.he_IL = גרפיקות Transport Tycoon Deluxe המקורי בגרסת DOS.
 description.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának grafikája.
 description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS.
-description.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe DOS útgáfunni.
 description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione DOS.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (DOS)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 도스 에디션의 그래픽입니다.
-description.la_VA = Graphica ex editione originale Transport Tycoon Deluxe DOS.
-description.lb_LU = Original Transport Tycoon Deluxe DOS Editioun Grafik.
-description.lt_LT = Originali Transport Tycoon Deluxe DOS leidimo grafika.
-description.lv_LV = Oriģinālā Transport Tycoon Deluxe DOS izdevuma grafika.
-description.ms_MY = Grafik asal Transport Tycoon Deluxe DOS edition.
 description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS.
 description.nl_NL = Originele graphics van de Transport Tycoon Deluxe DOS-versie.
 description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS.
 description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe DOS.
-description.pt_BR = Gráficos Originais do Transport Tycoon Deluxe, Edição DOS.
 description.pt_PT = Gráficos originais da edição DOS de Transport Tycoon Deluxe.
 description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru DOS.
 description.ru_RU = Оригинальная графика из Transport Tycoon Deluxe для DOS.
 description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (DOS).
-description.sl_SI = Originalna grafika Transport Tycoon Deluxe za različico DOS.
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za različico DOS.
 description.sr_RS = Originalni skup grafika Transport Tycoon Deluxe DOS izdanja.
 description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, DOS-utgåvan.
-description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS பதிப்பு அசைவூட்டங்கள்.
-description.th_TH = กราฟฟิกต้นตำหรับของ Transport Tycoon Deluxe DOS edition
-description.tr_TR = Özgün Transport Tycoon Deluxe DOS sürümü grafikleri.
-description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe DOS edition.
-description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên DOS
-description.zh_CN = 运输大亨DOS豪华版原版图形包.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü grafikleri.
 description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的圖形。

 [files]
-base              = TRG1.GRF
-logos             = TRGI.GRF
-arctic            = TRGC.GRF
-tropical          = TRGH.GRF
-toyland           = TRGT.GRF
-extra             = ORIG_EXTRA.GRF
+base         = TRG1.GRF
+logos        = TRGI.GRF
+arctic       = TRGC.GRF
+tropical     = TRGH.GRF
+toyland      = TRGT.GRF
+extra        = OPENTTD.GRF

 [md5s]
-TRG1.GRF          = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF          = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF          = ed446637e034104c5559b32c18afe78d
-TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF          = e30e8a398ae86c03dc534a8ac7dfb3b6
-ORIG_EXTRA.GRF    = 67bcfac5911667309d86b7749ea8d08c
+TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
+TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
+TRGC.GRF     = ed446637e034104c5559b32c18afe78d
+TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
+TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
+OPENTTD.GRF  = 8bcc7d7b6c7fdfba27af872743e9efd6

 [origin]
-default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTD.GRF  = This file was part of your OpenTTD installation.
--- a/bin/baseset/orig_dos.obs
+++ b/bin/baseset/orig_dos.obs
@@ -10,54 +10,34 @@ version           = 0
 description       = Original Transport Tycoon Deluxe DOS edition sounds.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe klanke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة الدوس
-description.be_BY = Арыґінальны набор гукавога афармленьня з гульні Transport Tycoon Deluxe для DOS.
 description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за DOS.
-description.ca_ES = Sons originals del Transport Tycoon Deluxe pel DOS.
+description.ca_ES = Sons originals de Transport Tycoon Deluxe per a DOS.
 description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro DOS).
-description.cy_GB = Effeithiau sain gwreiddiol fersiwn DOS o Transport Tycoon Deluxe.
-description.da_DK = Originallyd fra Transport Tycoon Deluxe DOS-version.
+description.da_DA = Originallyd fra Transport Tycoon Deluxe DOS-version.
 description.de_DE = Original Transport Tycoon Deluxe DOS Basissounds.
 description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe έκδοση DOS.
-description.en_AU = Original Transport Tycoon Deluxe DOS edition sounds.
+description.en_GB = Original Transport Tycoon Deluxe DOS edition sounds.
 description.en_US = Original Transport Tycoon Deluxe DOS edition sounds.
 description.es_ES = Sonidos originales de Transport Tycoon Deluxe versión DOS.
-description.es_MX = Sonidos originales de Transport Tycoon Deluxe para DOS.
-description.et_EE = Algse Transport Tycoon Deluxe DOSi versiooni helid.
-description.eu_ES = Transport Tycoon Deluxe originaleko DOS edizioko soinuak.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxen DOS-version äänet.
-description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version DOS).
-description.ga_IE = Fuaimeanna bunaidh Transport Tycoon Deluxe, eagrán DOS.
-description.gd_GB = Fuaimean aig an deasachadh DOS tùsail aig Transport Tycoon Deluxe.
-description.gl_ES = Sons da edición orixinal de Transport Tycoon Deluxe para DOS.
-description.he_IL = צלילי Transport Tycoon Deluxe המקורי בגרסת DOS.
+description.et_ET = Algse Transport Tycoon Deluxe DOSi versiooni helid.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS äänet.
 description.hr_HR = Originalni zvukovi za Transport Tycoon Deluxe DOS izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának hangjai.
+description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version DOS).
 description.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi DOS.
-description.is_IS = Upprunalega hljóðið úr Transport Tycoon Deluxe DOS útgáfunni.
 description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione DOS.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 効果音 (DOS)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 도스 에디션의 효과음입니다.
-description.la_VA = Soni ex editione originale Transport Tycoon Deluxe DOS.
-description.lb_LU = Original Transport Tycoon Deluxe DOS Editioun Sound.
-description.lt_LT = Originalūs Transport Tycoon Deluxe DOS leidimo garsai.
 description.nb_NO = Originale lyder fra Transport Tycoon Deluxe for DOS.
 description.nl_NL = Originele geluiden van de Transport Tycoon Deluxe DOS-versie.
 description.nn_NO = Originale lydar frå Transport Tycoon Deluxe for DOS.
 description.pl_PL = Oryginalna edycja dźwięków dla Transport Tycoon Deluxe DOS.
-description.pt_BR = Sons Originais do Transport Tycoon Deluxe, Edição DOS.
 description.pt_PT = Sons originais da edição DOS de Transport Tycoon Deluxe.
 description.ro_RO = Setul de sunete original al Transport Tycoon Deluxe pentru DOS.
 description.ru_RU = Оригинальный набор звукового оформления из игры Transport Tycoon Deluxe для DOS.
 description.sk_SK = Pôvodné zvuky Transport Tycoon Deluxe (DOS).
-description.sl_SI = Originalni zvoki Transport Tycoon Deluxe različice DOS.
+description.sl_SL = Originalni zvoki Transport Tycoon Deluxe različice DOS.
 description.sr_RS = Originalni skup zvukova Transport Tycoon Deluxe DOS izdanja.
 description.sv_SE = Originalljuden från Transport Tycoon Deluxe, DOS-utgåvan.
-description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS பதிப்பு ஒலிகள்.
-description.th_TH = เสียงต้นตำหรับของ Transport Tycoon Deluxe DOS edition
-description.tr_TR = Özgün Transport Tycoon Deluxe DOS sürümü sesleri.
-description.uk_UA = Оригінальний набір звуків з Transport Tycoon Deluxe DOS edition.
-description.vi_VN = Âm thanh gốc từ phiên bản Transport Tycoon Deluxe trên DOS
-description.zh_CN = 运输大亨DOS豪华版原版音效包.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü sesleri.
 description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的音效。

 [files]
--- a/bin/baseset/orig_dos_de.obg
+++ b/bin/baseset/orig_dos_de.obg
@@ -11,72 +11,52 @@ palette           = DOS
 description       = Original Transport Tycoon Deluxe DOS (German) edition graphics.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS (German) uitgawe grafieke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الالمانية نسخة الدوس
-description.be_BY = Арыґінальная ґрафіка зь нямецкай версіі Transport Tycoon Deluxe для DOS.
 description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS (немски) .
-description.ca_ES = Gràfics originals del Transport Tycoon Deluxe (alemany) pel DOS.
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS (Alemany).
 description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (německá verze pro DOS).
-description.cy_GB = Graffeg gwreiddiol fersiwn DOS (Almaenig) o Transport Tycoon Deluxe.
-description.da_DK = Originalgrafik fra Transport Tycoon Deluxe DOS (Tysk) version.
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe DOS (Tysk) version.
 description.de_DE = Original Transport Tycoon Deluxe DOS (Deutsch) Basisgrafiken.
 description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση DOS (Γερμανικό).
-description.en_AU = Original Transport Tycoon Deluxe DOS (German) edition graphics.
+description.en_GB = Original Transport Tycoon Deluxe DOS (German) edition graphics.
 description.en_US = Original Transport Tycoon Deluxe DOS (German) edition graphics.
 description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión DOS (Alemán).
-description.es_MX = Gráficos originales de Transport Tycoon Deluxe para DOS (en alemán).
-description.et_EE = Algse Transport Tycoon Deluxe DOSi (Saksa) versiooni graafika.
-description.fi_FI = Alkuperäiset Saksassa julkaistun Transport Tycoon Deluxen DOS-version grafiikat.
+description.et_ET = Algse Transport Tycoon Deluxe DOSi (Saksa) versiooni graafika.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS (Saksalainen) grafiikat.
 description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS allemande).
-description.ga_IE = Grafaicí bunaidhTransport Tycoon Deluxe, eagrán DOS (Gearmánach).
-description.gd_GB = Grafaigeachd aig an deasachadh DOS (Gearmailteach) tùsail aig Transport Tycoon Deluxe.
-description.gl_ES = Graficos da edición orixinal (alemá) de Transport Tycoon Deluxe para DOS.
-description.he_IL = גרפיקות Transport Tycoon Deluxe המקורי בגרסת DOS (גרמנית).
 description.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS (Njemački) izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS (német) verziójának grafikája.
 description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS (Jerman).
-description.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe DOS (þýsku) útgáfunni.
 description.it_IT = Grafica originale di Transport Tycoon Deluxe (tedesco), edizione DOS.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (DOS・ドイツ版)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 도스 에디션(독일)의 그래픽입니다.
-description.la_VA = Graphica ex editione originale Transport Tycoon Deluxe DOS (Germanica).
-description.lb_LU = Original Transport Tycoon Deluxe DOS (Däitsch) Editioun Grafik.
-description.lt_LT = Originali Transport Tycoon Deluxe DOS (Vokiečių) leidimo grafika.
-description.lv_LV = Oriģinālā Transport Tycoon Deluxe DOS (vācu) izdevuma grafika.
 description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS (tysk).
 description.nl_NL = Originele graphics van de Duitse Transport Tycoon Deluxe DOS-versie.
 description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS (tysk).
 description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe DOS (German).
-description.pt_BR = Gráficos Originais do Transport Tycoon Deluxe, Edição DOS alemã.
 description.pt_PT = Gráficos originais da edição DOS (Alemã) de Transport Tycoon Deluxe.
 description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru DOS (ediţia germană).
 description.ru_RU = Оригинальная графика из немецкой версии Transport Tycoon Deluxe для DOS.
 description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (DOS) (v jazyku nemčina).
-description.sl_SI = Originalna grafika Transport Tycoon Deluxe za nemško različico DOS.
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za nemško različico DOS.
 description.sr_RS = Originalni skup grafika nemačkog Transport Tycoon Deluxe DOS izdanja.
 description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, DOS-utgåvan (tyska).
-description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS (செருமன்) பதிப்பு அசைவூட்டங்கள்.
-description.th_TH = กราฟฟิกต้นตำหรับของ Transport Tycoon Deluxe DOS (German) edition
-description.tr_TR = Özgün Transport Tycoon Deluxe DOS (Almanca) sürümü grafikleri.
-description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe DOS edition (німецького).
-description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên DOS (tiếng Đức)
-description.zh_CN = 运输大亨DOS豪华德语版原版图形包.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS (Almanca) sürümü grafikleri.
 description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版 (德國版) 的圖形。

 [files]
-base              = TRG1.GRF
-logos             = TRGI.GRF
-arctic            = TRGC.GRF
-tropical          = TRGH.GRF
-toyland           = TRGT.GRF
-extra             = ORIG_EXTRA.GRF
+base         = TRG1.GRF
+logos        = TRGI.GRF
+arctic       = TRGC.GRF
+tropical     = TRGH.GRF
+toyland      = TRGT.GRF
+extra        = OPENTTD.GRF

 [md5s]
-TRG1.GRF          = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF          = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF          = ed446637e034104c5559b32c18afe78d
-TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF          = fcde1d7e8a74197d72a62695884b909e
-ORIG_EXTRA.GRF    = 67bcfac5911667309d86b7749ea8d08c
+TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
+TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
+TRGC.GRF     = ed446637e034104c5559b32c18afe78d
+TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
+TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
+OPENTTD.GRF  = 8bcc7d7b6c7fdfba27af872743e9efd6

 [origin]
-default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTD.GRF  = This file was part of your OpenTTD installation.
--- a/bin/baseset/orig_extra.grf
+++ b/bin/baseset/orig_extra.grf
--- a/bin/baseset/orig_win.obg
+++ b/bin/baseset/orig_win.obg
@@ -11,73 +11,52 @@ palette           = Windows
 description       = Original Transport Tycoon Deluxe Windows edition graphics.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe grafieke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة وندوز
-description.be_BY = Арыґінальная ґрафіка з Transport Tycoon Deluxe для Windows.
 description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за Windows.
-description.ca_ES = Gràfics originals del Transport Tycoon Deluxe pel Windows.
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a Windows.
 description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro Windows).
-description.cy_GB = Graffeg gwreiddiol fersiwn Windows o Transport Tycoon Deluxe.
-description.da_DK = Originalgrafik fra Transport Tycoon Deluxe Windows-version.
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe Windows-version.
 description.de_DE = Original Transport Tycoon Deluxe Windows Basisgrafiken.
 description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση Windows.
-description.en_AU = Original Transport Tycoon Deluxe Windows edition graphics.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition graphics.
 description.en_US = Original Transport Tycoon Deluxe Windows edition graphics.
 description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión Windows.
-description.es_MX = Gráficos originales de Transport Tycoon Deluxe para Windows.
-description.et_EE = Algse Transport Tycoon Deluxe Windowsi versiooni graafika.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxen Windows-version grafiikat.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni graafika.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe Windows grafiikat.
 description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version Windows).
-description.ga_IE = Grafaicí bunaidhTransport Tycoon Deluxe, eagrán Windows.
-description.gd_GB = Grafaigeachd aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
-description.gl_ES = Graficos da edición orixinal de Transport Tycoon Deluxe para Windows.
-description.he_IL = גרפיקות Transport Tycoon Deluxe המקורי בגרסת Windows.
 description.hr_HR = Originalna grafika za Transport Tycoon Deluxe Windows izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának grafikája.
 description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi Windows.
-description.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe Windows útgáfunni.
 description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione Windows.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (Windows)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 그래픽입니다.
-description.la_VA = Graphica ex editione originale Transport Tycoon Deluxe Windows.
-description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Grafik.
-description.lt_LT = Originali Transport Tycoon Deluxe Windows leidimo grafika.
-description.lv_LV = Oriģinālā Transport Tycoon Deluxe Windows izdevuma grafika.
-description.ms_MY = Grafik asal Transport Tycoon Deluxe edisi Windows.
 description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for Windows.
 description.nl_NL = Originele graphics van de Transport Tycoon Deluxe Windows-versie.
 description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for Windows.
 description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe Windows.
-description.pt_BR = Gráficos Originais do Transport Tycoon, Edição Windows.
 description.pt_PT = Gráficos originais da edição Windows de Transport Tycoon Deluxe.
 description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru Windows.
 description.ru_RU = Оригинальная графика из Transport Tycoon Deluxe для Windows.
 description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (Windows).
-description.sl_SI = Originalna grafika Transport Tycoon Deluxe za različico oken(windows).
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za različico oken(windows).
 description.sr_RS = Originalni skup grafika Transport Tycoon Deluxe Windows izdanja.
 description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, Windows-utgåvan.
-description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு அசைவூட்டங்கள்.
-description.th_TH = กราฟฟิกต้ำตำหรับของ Transport Tycoon Deluxe Windows edition
-description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü grafikleri.
-description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe Windows edition.
-description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên Windows
-description.zh_CN = 运输大亨Windows豪华版原版图形包.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü grafikleri.
 description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的圖形。

 [files]
-base              = TRG1R.GRF
-logos             = TRGIR.GRF
-arctic            = TRGCR.GRF
-tropical          = TRGHR.GRF
-toyland           = TRGTR.GRF
-extra             = ORIG_EXTRA.GRF
+base         = TRG1R.GRF
+logos        = TRGIR.GRF
+arctic       = TRGCR.GRF
+tropical     = TRGHR.GRF
+toyland      = TRGTR.GRF
+extra        = OPENTTD.GRF

 [md5s]
-TRG1R.GRF         = b04ce593d8c5016e07473a743d7d3358
-TRGIR.GRF         = 0c2484ff6be49fc63a83be6ab5c38f32
-TRGCR.GRF         = 3668f410c761a050b5e7095a2b14879b
-TRGHR.GRF         = 06bf2b7a31766f048baac2ebe43457b1
-TRGTR.GRF         = de53650517fe661ceaa3138c6edb0eb8
-ORIG_EXTRA.GRF    = 67bcfac5911667309d86b7749ea8d08c
+TRG1R.GRF    = b04ce593d8c5016e07473a743d7d3358
+TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
+TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
+TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
+TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
+OPENTTD.GRF  = 8bcc7d7b6c7fdfba27af872743e9efd6

 [origin]
-default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTD.GRF  = This file was part of your OpenTTD installation.
--- a/bin/baseset/orig_win.obm
+++ b/bin/baseset/orig_win.obm
@@ -10,55 +10,34 @@ version           = 1
 description       = Original Transport Tycoon Deluxe Windows edition music.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe musiek.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الموسيقية نسخة وندوز
-description.be_BY = Арыґінальны набор музычнага афармленьня з гульні Transport Tycoon Deluxe для Windows.
 description.bg_BG = Оригинална музика на Transport Tycoon Deluxe за Windows.
-description.ca_ES = Música original del Transport Tycoon Deluxe pel Windows.
+description.ca_ES = Música Original de Transport Tycoon Deluxe per a Windows.
 description.cs_CZ = Původní hudba Transport Tycoon Deluxe (verze pro Windows).
-description.cy_GB = Cerddoriaeth gwreiddiol fersion Windows o Transport Tycoon Deluxe.
-description.da_DK = Originalmusik fra Transport Tycoon Deluxe Windows-version.
+description.da_DA = Originalmusik fra Transport Tycoon Deluxe Windows-version.
 description.de_DE = Original Transport Tycoon Deluxe Windows Musikset.
 description.el_GR = Αρχική μουσική από το Transport Tycoon Deluxe έκδοση Windows.
-description.en_AU = Original Transport Tycoon Deluxe Windows edition music.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition music.
 description.en_US = Original Transport Tycoon Deluxe Windows edition music.
 description.es_ES = Música original de Transport Tycoon Deluxe versión Windows.
-description.es_MX = Música original de Transport Tycoon Deluxe para Windows.
-description.et_EE = Algse Transport Tycoon Deluxe Windowsi versiooni muusika.
-description.fi_FI = Alkuperäinen Transport Tycoon Deluxen Windows-version musiikki.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni muusika.
+description.fi_FI = Alkuperäinen Transport Tycoon Deluxe Windows musiikki.
 description.fr_FR = Musiques originales de Transport Tycoon Deluxe (version Windows).
-description.ga_IE = Ceol bunaidh Transport Tycoon Deluxe, eagrán Windows.
-description.gd_GB = Ceòl aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
-description.gl_ES = Música da edición orixinal de Transport Tycoon Deluxe para Windows.
-description.he_IL = מנגינות Transport Tycoon Deluxe המקורי בגרסת Windows.
-description.hr_HR = Originalna glazba za Transport Tycoon Deluxe Windows izdanje.
+description.hr_HR = Originalna muzika za Transport Tycoon Deluxe Windows izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának zenéje.
 description.id_ID = Musik pengiring orisinil Transport Tycoon Deluxe versi Windows.
-description.is_IS = Upprunalega tónlistin úr Transport Tycoon Deluxe Windows útgáfunni.
 description.it_IT = Musica originale di Transport Tycoon Deluxe, edizione Windows.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 音楽 (Windows)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 음악입니다.
-description.la_VA = Musica ex editione originale Transport Tycoon Deluxe Windows.
-description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Musik.
-description.lt_LT = Originali Transport Tycoon Deluxe Windows leidimo muzika.
-description.lv_LV = Oriģinālā Transport Tycoon Deluxe Windows izdevuma mūzika.
-description.ms_MY = Muzik asal Transport Tycoon Deluxe edisi Windows.
 description.nb_NO = Original musikk fra Transport Tycoon Deluxe for Windows.
 description.nl_NL = Originele muziek van de Transport Tycoon Deluxe Windows-versie.
 description.nn_NO = Original musikk frå Transport Tycoon Deluxe for Windows.
 description.pl_PL = Oryginalna edycja utworów muzycznych w Transport Tycoon Deluxe Windows.
-description.pt_BR = Música Original do Transport Tycoon Deluxe, Edição Windows
 description.pt_PT = Música original da edição Windows de Transport Tycoon Deluxe.
 description.ro_RO = Setul de muzică original al Transport Tycoon Deluxe pentru Windows.
-description.ru_RU = Оригинальный набор музыкального оформления из игры Transport Tycoon Deluxe для Windows.
+description.ru_RU = Оригинальный набор музыкального оформления из игры Transport Tycoon Deluxe.
 description.sk_SK = Pôvodná hudba z Transport Tycoon Deluxe (Windows).
-description.sl_SI = Originalna glasba Transport Tycoon Deluxe različice oken(windows).
+description.sl_SL = Originalna glasba Transport Tycoon Deluxe različice oken(windows).
 description.sr_RS = Originalni skup muzičkih numera Transport Tycoon Deluxe Windows izdanja.
 description.sv_SE = Originalmusiken från Transport Tycoon Deluxe, Windows-utgåvan.
-description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு இசை.
-description.th_TH = เพลงต้นตำหรับชอง Transport Tycoon Deluxe Windows edition
-description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü müzikleri.
-description.uk_UA = Оригінальна музика з Transport Tycoon Deluxe Windows edition.
-description.vi_VN = Nhạc gốc từ phiên bản Transport Tycoon Deluxe trên Windows
-description.zh_CN = Transport Tycoon Deluxe（运输大亨Windows豪华版）的原版音乐包
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü müzikleri.
 description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音樂。

 [files]
--- a/bin/baseset/orig_win.obs
+++ b/bin/baseset/orig_win.obs
@@ -10,54 +10,34 @@ version           = 0
 description       = Original Transport Tycoon Deluxe Windows edition sounds.
 description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe klanke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة وندوز
-description.be_BY = Арыґінальны набор гукавога афармленьня з гульні Transport Tycoon Deluxe для Windows.
 description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за Windows.
-description.ca_ES = Sons originals del Transport Tycoon Deluxe pel Windows.
+description.ca_ES = Sons originals de Transport Tycoon Deluxe per a Windows.
 description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro Windows).
-description.cy_GB = Effeithiau sain gwreiddiol fersiwn Windows o Transport Tycoon Deluxe.
-description.da_DK = Originallyd fra Transport Tycoon Deluxe Windows-version.
+description.da_DA = Originallyd fra Transport Tycoon Deluxe Windows-version.
 description.de_DE = Original Transport Tycoon Deluxe Windows Basissounds.
 description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe έκδοση Windows.
-description.en_AU = Original Transport Tycoon Deluxe Windows edition sounds.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition sounds.
 description.en_US = Original Transport Tycoon Deluxe Windows edition sounds.
 description.es_ES = Sonidos originales de Transport Tycoon Deluxe versión Windows.
-description.es_MX = Sonidos originales de Transport Tycoon Deluxe para Windows.
-description.et_EE = Algse Transport Tycoon Deluxe Windowsi versiooni helid.
-description.eu_ES = Transport Tycoon Deluxe originaleko Windows edizioko grafikoak.
-description.fi_FI = Alkuperäiset Transport Tycoon Deluxen Windows-version äänet.
-description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version Windows).
-description.ga_IE = Fuaimeanna bunaidh Transport Tycoon Deluxe, eagrán Windows.
-description.gd_GB = Fuaimean aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
-description.gl_ES = Sons da edición orixinal de Transport Tycoon Deluxe para Windows.
-description.he_IL = צלילי Transport Tycoon Deluxe המקורי בגרסת Windows.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni helid.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe Windows äänet.
 description.hr_HR = Originalni zvukovi za Transport Tycoon Deluxe Windows izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának hangjai.
+description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version Windows).
 description.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi Windows.
-description.is_IS = Upprunalega hljóðið úr Transport Tycoon Deluxe Windows útgáfunni.
 description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione Windows.
-description.ja_JP = Transport Tycoon Deluxe オリジナル版 効果音 (Windows)
-description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 효과음입니다.
-description.la_VA = Soni ex editione originale Transport Tycoon Deluxe Windows.
-description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Sound.
-description.lt_LT = Originalūs Transport Tycoon Deluxe Windows leidimo garsai.
 description.nb_NO = Originale lyder fra Transport Tycoon Deluxe for Windows.
 description.nl_NL = Originele geluiden van de Transport Tycoon Deluxe Windows-versie.
 description.nn_NO = Originale lydar frå Transport Tycoon Deluxe for Windows.
 description.pl_PL = Oryginalna edycja dźwięków dla Transport Tycoon Deluxe Windows.
-description.pt_BR = Sons Originais do Transport Tycoon Deluxe, Edição Windows.
 description.pt_PT = Sons originais da edição Windows de Transport Tycoon Deluxe.
 description.ro_RO = Setul de sunete original al Transport Tycoon Deluxe pentru Windows.
 description.ru_RU = Оригинальный набор звукового оформления из игры Transport Tycoon Deluxe для Windows.
 description.sk_SK = Pôvodné zvuky Transport Tycoon Deluxe (Windows).
-description.sl_SI = Originalni zvoki Transport Tycoon Deluxe različice oken(windows).
+description.sl_SL = Originalni zvoki Transport Tycoon Deluxe različice oken(windows).
 description.sr_RS = Originalni skup zvukova Transport Tycoon Deluxe Windows izdanja.
 description.sv_SE = Originalljuden från Transport Tycoon Deluxe, Windows-utgåvan.
-description.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு ஒலிகள்.
-description.th_TH = เสียงต้นตำหรับของ Transport Tycoon Deluxe Windows edition
-description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü sesleri.
-description.uk_UA = Оригінальний набір звуків з Transport Tycoon Deluxe Windows edition.
-description.vi_VN = Âm thanh gốc từ phiên bản Transport Tycoon Deluxe trên Windows
-description.zh_CN = Transport Tycoon Deluxe Windows (运输大亨Windows豪华版)的原版音效包.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü sesleri.
 description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音效。

 [files]
--- a/bin/game/compat_1.2.nut
+++ b/bin/game/compat_1.2.nut
@@ -1,25 +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/>.
- */
-
-GSLog.Info("1.2 API compatibility in effect.");
-
-GSTown._SetGrowthRate <- GSTown.SetGrowthRate;
-GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
-{
-	/* Growth rate 0 caused resetting the custom growth rate. While this was undocumented, it was used nevertheless (ofc). */
-	if (days_between_town_growth == 0) days_between_town_growth = GSTown.TOWN_GROWTH_NORMAL;
-	return GSTown._SetGrowthRate(town_id, days_between_town_growth);
-}
-
-/* 1.5 adds a game element reference to the news. */
-GSNews._Create <- GSNews.Create;
-GSNews.Create <- function(type, text, company)
-{
-    return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
-}
--- a/bin/game/compat_1.3.nut
+++ b/bin/game/compat_1.3.nut
@@ -1,25 +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/>.
- */
-
-GSLog.Info("1.3 API compatibility in effect.");
-
-GSTown._SetGrowthRate <- GSTown.SetGrowthRate;
-GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
-{
-	/* Growth rate 0 caused resetting the custom growth rate. While this was undocumented, it was used nevertheless (ofc). */
-	if (days_between_town_growth == 0) days_between_town_growth = GSTown.TOWN_GROWTH_NORMAL;
-	return GSTown._SetGrowthRate(town_id, days_between_town_growth);
-}
-
-/* 1.5 adds a game element reference to the news. */
-GSNews._Create <- GSNews.Create;
-GSNews.Create <- function(type, text, company)
-{
-    return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
-}
--- a/bin/game/compat_1.4.nut
+++ b/bin/game/compat_1.4.nut
@@ -1,17 +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/>.
- */
-
-GSLog.Info("1.4 API compatibility in effect.");
-
-/* 1.5 adds a game element reference to the news. */
-GSNews._Create <- GSNews.Create;
-GSNews.Create <- function(type, text, company)
-{
-    return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
-}
--- a/bin/game/compat_1.5.nut
+++ b/bin/game/compat_1.5.nut
@@ -1,10 +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/>.
- */
-
-GSLog.Info("1.5 API compatibility in effect.");
--- a/bin/game/compat_1.6.nut
+++ b/bin/game/compat_1.6.nut
@@ -1,10 +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/>.
- */
-
-GSLog.Info("1.6 API compatibility in effect.");
--- a/bin/game/compat_1.7.nut
+++ b/bin/game/compat_1.7.nut
@@ -1,10 +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/>.
- */
-
-GSLog.Info("1.7 API compatibility in effect.");
--- a/bin/game/compat_1.8.nut
+++ b/bin/game/compat_1.8.nut
@@ -1,8 +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/>.
- */
--- a/changelog.txt
+++ b/changelog.txt
--- a/config.lib
+++ b/config.lib
--- a/3
+++ b/3
@@ -129,7 +129,6 @@ AWKCOMMAND='
 		if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0")  { next; }
 		if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
 		if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0")       { next; }
-		if ($0 == "SSE"         && "'$with_sse'" != "1")           { next; }

 		skip += 1;

@@ -149,7 +148,7 @@ AWKCOMMAND='

 # Read the source.list and process it
 # Please escape ALL " within ` because e.g. "" terminates the string in some sh implementations
-SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk \"$AWKCOMMAND\" | LC_ALL=C $PIPE_SORT`"
+SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk \"$AWKCOMMAND\" | $PIPE_SORT`"

 OBJS_C="`  echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.c$/   { gsub(\".c$\",   \".o\", $0); print $0; }'`"
 OBJS_CPP="`echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.cpp$/ { gsub(\".cpp$\", \".o\", $0); print $0; }'`"
--- a/docs/32bpp.txt
+++ b/docs/32bpp.txt
@@ -0,0 +1,44 @@
+32bpp and OpenTTD
+Last updated:    2007-06-13
+------------------------------------------------------------------------
+
+
+Table of contents
+-----------------
+1.0) About
+2.0) The format
+
+
+1.0) About
+---- -----
+OpenTTD has 32bpp support. This means: OpenTTD still is 8bpp, but it has the
+posibility to override the graphics with 32bpp. This means that it isn't a
+replacement of grf or newgrf, but simply an addition. If you want to use 32bpp
+graphics of a newgrf, you do need the newgrf itself too (with 8bpp graphics).
+
+
+2.0) The format
+---- ----------
+32bpp images are stored in PNG. They should go in:
+  data/sprites/<grfname>/<SpriteID>.png
+
+For example, a grfname would be 'openttd' (without .grf, lowercase), and the
+SpriteID 3, to override the 3rd sprite in openttd.grf with a 32bpp version.
+
+The format of this PNG can be almost anything, but we advise to use RGBA
+format. Alpha-channel is fully supported.
+
+As the core of OpenTTD is 8bpp, and because you of course want company colours
+in your images, you will need to add a mask for every sprite that needs colour
+remapping. The name is simular as above, only you have to put a 'm' behind the
+SpriteID. This image should be a 8bpp palette image, where the palette is the
+OpenTTD palette. Upon load of the PNG, the mask is loaded too, and overrides
+the RGB (not the Alpha) of the original PNG image, and replacing it with a
+8bpp color remapped and converted to 32bpp.
+
+Another thing that OpenTTD needs in your png, is 2 tEXt chunks: x_offs and
+y_offs. This to define the x- and y-offset, of course. Use the tool we supply
+to add this information. Sadly enough most graphical editors trashes those
+chunks upon save, so you have to readd it every time you save your image.
+
+Your images should be the same as the grf, in size.
--- a/docs/admin_network.txt
+++ b/docs/admin_network.txt
@@ -150,8 +150,7 @@ Table of contents

  Note: No additional authentication is required for rcon commands.

-  The server will reply with one or more ADMIN_PACKET_SERVER_RCON packets.
-  Finally an ADMIN_PACKET_ADMIN_RCON_END packet will be sent. Applications
+  The server will reply with a ADMIN_PACKET_SERVER_RCON packet. Applications
  will not receive the answer twice if they have asked for the AdminUpdateType
  ADMIN_UPDATE_CONSOLE, as the result is not printed on the servers console
  (just like clients rcon commands).
@@ -161,13 +160,6 @@ Table of contents
  Chat from the server itself will only be sent to the admin network when it
  was not sent from the admin network.

-  Note that when content is queried or updated via rcon, the processing
-  happens asynchronously. But the ADMIN_PACKET_ADMIN_RCON_END packet is sent
-  already right after the content is requested as there's no immediate output.
-  Thus other packages and the output of content rcon command may be sent at
-  an arbitrary later time, mixing into the output of other console activity,
-  e.g. also of possible subsequent other rcon commands sent.
-

 5.0) Sending chat
 ---- ------------
--- a/docs/desync.txt
+++ b/docs/desync.txt
@@ -1,268 +0,0 @@
-Some explanations about Desyncs
-Last updated: 2014-02-23
------------------------------------------------------------------------
-
-
-Table of contents
-----------------
-1.0) Desync theory
- * 1.1) OpenTTD multiplayer architecture
- * 1.2) What is a Desync and how is it detected
- * 1.3) Typical causes of Desyncs
-2.0) What to do in case of a Desync
- * 2.1) Cache debugging
- * 2.2) Desync recording
-3.0) Evaluating the Desync records
- * 3.1) Replaying
- * 3.2) Evaluation the replay
- * 3.3) Comparing savegames
-
-
-1.1) OpenTTD multiplayer architecture
---- --------------------------------
-  OpenTTD has a huge gamestate, which changes all of the time.
-  The savegame contains the complete gamestate at a specific point
-  in time. But this state changes completely each tick: Vehicles move
-  and trees grow.
-
-  However, most of these changes in the gamestate are deterministic:
-  Without a player interfering a vehicle follows its orders always
-  in the same way, and trees always grow the same.
-
-  In OpenTTD multiplayer synchronisation works by creating a savegame
-  when clients join, and then transfering that savegame to the client,
-  so it has the complete gamestate at a fixed point in time.
-
-  Afterwards clients only receive 'commands', that is: Stuff which is
-  not predictable, like
-   - player actions
-   - AI actions
-   - GameScript actions
-   - Admin Port command
-   - rcon commands
-   - ...
-
-  These commands contain the information on how to execute the command,
-  and when to execute it. Time is measured in 'network frames'.
-  Mind that network frames to not match ingame time. Network frames
-  also run while the game is paused, to give a defined behaviour to
-  stuff that is executing while the game is paused.
-
-  The deterministic part of the gamestate is run by the clients on
-  their own. All they get from the server is the instruction to
-  run the gamestate up to a certain network time, which basically
-  says that there are no commands scheduled in that time.
-
-  When a client (which includes the server itself) wants to execute
-  a command (i.e. a non-predictable action), it does this by
-   - calling DoCommandP resp. DoCommandPInternal
-   - These functions first do a local test-run of the command to
-     check simple preconditions. (Just to give the client an
-     immediate response without bothering the server and waiting for
-     the response.) The test-run may not actually change the
-     gamestate, all changes must be discarded.
-   - If the local test-run succeeds the command is sent to the server.
-   - The server inserts the command into the command queue, which
-     assigns a network frame to the commands, i.e. when it shall be
-     executed on all clients.
-   - Enhanced with this specific timestamp, the command is send to all
-     clients, which execute the command simultaneously in the same
-     network frame in the same order.
-
-1.2) What is a Desync and how is it detected
---- ---------------------------------------
-  In the ideal case all clients have the same gamestate as the server
-  and run in sync. That is, vehicle movement is the same on all
-  clients, and commands are executed the same everywhere and
-  have the same results.
-
-  When a Desync happens, it means that the gamestates on the clients
-  (including the server) are no longer the same. Just imagine
-  that a vehicle picks the left line instead of the right line at
-  a junction on one client.
-
-  The important thing here is, that noone notices when a Desync
-  occurs. The desync client will continue to simulate the gamestate
-  and execute commands from the server. Once the gamestate differs
-  it will increasingly spiral out of control: If a vehicle picks a
-  different route, it will arrive at a different time at a station,
-  which will load different cargo, which causes other vehicles to
-  load other stuff, which causes industries to notice different
-  servicing, which causes industries to change production, ...
-  the client could run all day in a different universe.
-
-  To limit how long a Desync can remain unnoticed, the server
-  transfers some checksums every now and then for the gamestate.
-  Currently this checksum is the state of the random number
-  generator of the game logic. A lot of things in OpenTTD depend
-  on the RNG, and if the gamestate differs, it is likely that the
-  RNG is called at different times, and the state differs when
-  checked.
-
-  The clients compare this 'checksum' with the checksum of their
-  own gamestate at the specific network frame. If they differ,
-  the client disconnects with a Desync error.
-
-  The important thing here is: The detection of the Desync is
-  only an ultimate failure detection. It does not give any
-  indication on when the Desync happened. The Desync may after
-  all have occurred long ago, and just did not affect the checksum
-  up to now. The checksum may have matched 10 times or more
-  since the Desync happend, and only now the Desync has spiraled
-  enough to finally affect the checksum. (There was once a desync
-  which was only noticed by the checksum after 20 game years.)
-
-1.3) Typical causes of Desyncs
---- -------------------------
-  Desyncs can be caused by the following scenarios:
-   - The savegame does not describe the complete gamestate.
-      - Some information which affects the progression of the
-        gamestate is not saved in the savegame.
-      - Some information which affects the progression of the
-        gamestate is not loaded from the savegame.
-        This includes the case that something is not completely
-        reset before loading the savegame, so data from the
-        previous game is carried over to the new one.
-   - The gamestate does not behave deterministic.
-      - Cache mismatch: The game logic depends on some cached
-        values, which are not invalidated properly. This is
-        the usual case for NewGRF-specific Desyncs.
-      - Undefined behaviour: The game logic performs multiple
-        things in an undefined order or with an undefined
-        result. E.g. when sorting something with a key while
-        some keys are equal. Or some computation that depends
-        on the CPU architecture (32/64 bit, little/big endian).
-   - The gamestate is modified when it shall not be modified.
-      - The test-run of a command alters the gamestate.
-      - The gamestate is altered by a player or script without
-        using commands.
-
-
-2.1) Cache debugging
---- ---------------
-  Desyncs which are caused by inproper cache validation can
-  often be found by enabling cache validation:
-   - Start OpenTTD with '-d desync=2'.
-   - This will enable validation of caches every tick.
-     That is, cached values are recomputed every tick and compared
-     to the cached value.
-   - Differences are logged to 'commands-out.log' in the autosave
-     folder.
-
-  Mind that this type of debugging can also be done in singleplayer.
-
-2.2) Desync recording
---- ----------------
-  If you have a server, which happens to encounter Desyncs often,
-  you can enable recording of the gamestate alterations. This
-  will later allow the replay the gamestate and locate the Desync
-  cause.
-
-  There are two levels of Desync recording, which are enabled
-  via '-d desync=2' resp. '-d desync=3'. Both will record all
-  commands to a file 'commands-out.log' in the autosave folder.
-
-  If you have the savegame from the start of the server, and
-  this command log you can replay the whole game. (see Section 3.1)
-
-  If you do not start the server from a savegame, there will
-  also be a savegame created just after a map has been generated.
-  The savegame will be named 'dmp_cmds_*.sav' and be put into
-  the autosave folder.
-
-  In addition to that '-d desync=3' also creates regular savegames
-  at defined spots in network time. (more defined than regular
-  autosaves). These will be created in the autosave folder
-  and will also be named 'dmp_cmds_*.sav'.
-
-  These saves allow comparing the gamestate with the original
-  gamestate during replaying, and thus greatly help debugging.
-  However, they also take a lot of disk space.
-
-
-3.1) Replaying
---- ---------
-  To replay a Desync recording, you need these files:
-   - The savegame from when the server was started, resp.
-     the automatically created savegame from when the map
-     was generated.
-   - The 'commands-out.log' file.
-   - Optionally the 'dmp_cmds_*.sav'.
-  Put these files into a safe spot. (Not your autosave folder!)
-
-  Next, prepare your OpenTTD for replaying:
-   - Get the same version of OpenTTD as the original server was running.
-   - Uncomment/enable the define 'DEBUG_DUMP_COMMANDS' in
-     'src/network/network_func.h'.
-     (DEBUG_FAILED_DUMP_COMMANDS is explained later)
-   - Put the 'commands-out.log' into the root save folder, and rename
-      it to 'commands.log'.
-   - Run 'openttd -D -d desync=3 -g startsavegame.sav'.
-     This replays the server log and creates new 'commands-out.log'
-     and 'dmp_cmds_*.sav' in your autosave folder.
-
-3.2) Evaluation the replay
---- ---------------------
-  The replaying will also compare the checksums which are part of
-  the 'commands-out.log' with the replayed gamestate.
-  If they differ, it will trigger a 'NOT_REACHED'.
-
-  If the replay succeeds without mismatch, that is the replay reproduces
-  the original server state:
-   - Repeat the replay starting from incrementally later 'dmp_cmds_*.sav'
-     while truncating the 'commands.log' at the beginning appropriately.
-     The 'dmp_cmds_*.sav' can be your own ones from the first reply, or
-     the ones from the original server (if you have them).
-     (This simulates the view of joining clients during the game.)
-   - If one of those replays fails, you have located the Desync between
-     the last dmp_cmds that reproduces the replay and the first one
-     that fails.
-
-  If the replay does not succeed without mismatch, you can check the logs
-  whether there were failed commands. Then you may try to replay with
-  DEBUG_FAILED_DUMP_COMMANDS enabled. If the replay then fails, the
-  command test-run of the failed command modified the game state.
-
-  If you have the original 'dmp_cmds_*.sav', you can also compare those
-  savegames with your own ones from the replay. You can also comment/disable
-  the 'NOT_REACHED' mentioned above, to get another 'dmp_cmds_*.sav' from
-  the replay after the mismatch has already been detected.
-  See Section 3.2 on how to compare savegames.
-  If the saves differ you have located the Desync between the last dmp_cmds
-  that match and the first one that does not. The difference of the saves
-  may point you in the direction of what causes it.
-
-  If the replay succeeds without mismatch, and you do not have any
-  'dmp_cmd_*.sav' from the original server, it is a lost case.
-  Enable creation of the 'dmp_cmd_*.sav' on the server, and wait for the
-  next Desync.
-
-  Finally, you can also compare the 'commands-out.log' from the original
-  server with the one from the replay. They will differ in stuff like
-  dates, and the original log will contain the chat, but otherwise they
-  should match.
-
-3.2) Comparing savegames
---- -------------------
-  The binary form of the savegames from the original server and from
-  your replay will always differ:
-   - The savegame contains paths to used NewGRF files.
-   - The gamelog will log your loading of the savegame.
-   - The savegame data of AIs and the Gamescript will differ.
-     Scripts are not run during the replay, only their recorded commands
-     are replayed. Their internal state will thus not change in the
-     replay and will differ.
-
-  To compare savegame more semantically, there exist some ugly hackish
-  tools at:
-     http://devs.openttd.org/~frosch/texts/zpipe.c
-     http://devs.openttd.org/~frosch/texts/printhunk.c
-
-  The first one decompresses OpenTTD savegames. The second one creates
-  a textual representation of an uncompressed savegame, by parsing hunks
-  and arrays and such. With both tools you need to be a bit careful
-  since they work on stdin and stdout, which may not deal well with
-  binary data.
-
-  If you have the textual representation of the savegames, you can
-  compare them with regular diff tools.
--- a/docs/landscape.html
+++ b/docs/landscape.html
@@ -15,60 +15,20 @@
  For a graphical representation of the tile-layout have a look at
  <a href="landscape_grid.html">Landscape grid</a> page.
 </p>
- <p>Nine attributes (counting &quot;<span style="font-weight: bold;">type</span>&quot; and
-  &quot;<span style="font-weight: bold;">height</span>&quot;) hold the informations about a tile.<BR>
+ <p>Eight attributes (counting &quot;<span style="font-weight: bold;">type_height</span>&quot;) hold the informations about a tile.<BR>
  These attributes are referred to as
-  &quot;<span style="font-weight: bold;">type</span>",
-  &quot;<span style="font-weight: bold;">height</span>",
+  &quot;<span style="font-weight: bold;">type_height</span>",
  &quot;<span style="font-weight: bold;">m1</span>&quot;, &quot;<span style="font-weight: bold;">m2</span>&quot;,
  &quot;<span style="font-weight: bold;">m3</span>&quot;, &quot;<span style="font-weight: bold;">m4</span>&quot;,
  &quot;<span style="font-weight: bold;">m5</span>&quot;, &quot;<span style="font-weight: bold;">m6</span>&quot;
  and "<span style="font-weight: bold;">m7</span>".<br>
  The most important value is the class of a tile, stored in the upper 4 bits
-  of the <span style="font-weight: bold;">type</span> attribute.
+  of the <span style="font-weight: bold;">type_height</span> attribute. The lower 4 bits are used to encode the height and
+  slope data.
 </p>

 Frequently repeating patterns:
 <ul>
-  <li><span style="font-weight: bold;">type</span>
-   <ul>
-    <li>
-     <a name="type"></a>
-     Bits 7..4:
-     <table border="1" style="width: 30em;">
-      <tr bgcolor="#CCCCCC"><td colspan="2">The tile type.</td></tr>
-      <tr><td style="width: 5em;"><tt>00</tt></td><td>Ground</td></tr>
-      <tr><td><tt>01</tt></td><td>Railway tracks</td></tr>
-      <tr><td><tt>02</tt></td><td>Roads</td></tr>
-      <tr><td><tt>03</tt></td><td>Town building</td></tr>
-      <tr><td><tt>04</tt></td><td>Trees</td></tr>
-      <tr><td><tt>05</tt></td><td>Station tiles</td></tr>
-      <tr><td><tt>06</tt></td><td>Water</td></tr>
-      <tr><td><tt>07</tt></td><td>Void</td></tr>
-      <tr><td><tt>08</tt></td><td>Industries</td></tr>
-      <tr><td><tt>09</tt></td><td>Tunnel / bridge</td></tr>
-      <tr><td><tt>0A</tt></td><td>Objects</td></tr>
-     </table>
-    </li>
-     Bits 3..2:
-     <table border="1" style="width: 30em;">
-      <tr bgcolor="#CCCCCC"><td colspan="2">Presence and direction of bridge above.</td></tr>
-      <tr><td style="width: 5em;"><tt>00</tt></td><td>no bridge</td></tr>
-      <tr><td><tt>01</tt></td><td>Axis X (North-East)</td></tr>
-      <tr><td><tt>02</tt></td><td>Axis Y (South-West)</td></tr>
-     </table>
-    <li>
-     <a name="tropic_zone"></a>
-     Bits 1..0:
-     <table border="1" style="width: 30em;">
-      <tr bgcolor="#CCCCCC"><td colspan="2">Only meaningfull in tropic climate. It contains the definition of the available zones</td></tr>
-      <tr><td style="width: 5em;"><tt>00</tt></td><td>normal</td></tr>
-      <tr><td><tt>01</tt></td><td>desert</td></tr>
-      <tr><td><tt>02</tt></td><td>rain forest</td></tr>
-     </table>
-     In any other climate these 2 bits are theoretically free of use, however using them does not seem useful.
-    </li>
-   </ul>
  <li><span style="font-weight: bold;">m1</span>
   <ul>
    <li>
@@ -98,6 +58,32 @@
    </li>
   </ul>
  </li>
+  <li><span style="font-weight: bold;">m6</span>
+   <ul>
+    <li>
+     <a name="bridge_direction"></a>
+     Bits 7..6:
+     <table border="1" style="width: 30em;">
+      <tr bgcolor="#CCCCCC"><td colspan="2">Presence and direction of bridge above, for tiles that support this.</td></tr>
+      <tr><td style="width: 5em;"><tt>00</tt></td><td>no bridge</td></tr>
+      <tr><td><tt>01</tt></td><td>Axis X (North-East)</td></tr>
+      <tr><td><tt>02</tt></td><td>Axis Y (South-West)</td></tr>
+     </table>
+     Some tiles, such as houses do not support bridges over them and use these bits for other purposes.
+    </li>
+    <li>
+     <a name="tropic_zone"></a>
+     Bits 1..0:
+     <table border="1" style="width: 30em;">
+      <tr bgcolor="#CCCCCC"><td colspan="2">Only meaningfull in tropic climate. It contains the definition of the available zones</td></tr>
+      <tr><td style="width: 5em;"><tt>00</tt></td><td>normal</td></tr>
+      <tr><td><tt>01</tt></td><td>desert</td></tr>
+      <tr><td><tt>02</tt></td><td>rain forest</td></tr>
+     </table>
+     In any other climate these 2 bits are theoretically free of use, however using them does not seem useful.
+    </li>
+   </ul>
+  </li>
  <li><span style="font-weight: bold;">m7:</span><br>
   Animation frame/state. Used for houses, industries, objects and stations.
  </li>
@@ -210,7 +196,9 @@
       </tr>
      </table>
     </li>
+     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
     <li>m6 bits 4..2: type of hedge on NW border of the tile</li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
    </ul>
   </td>
  </tr>
@@ -522,6 +510,8 @@
       <li>m5 bit 4: pbs reservation state</li>
      </ul>
     </li>
+     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
    </ul>
   </td>
  </tr>
@@ -549,7 +539,6 @@
       </tr>
      </table>
     </li>
-     <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
     <li>m5 bits 7 clear: road or level-crossing
      <ul>
       <li>m6 bits 5..3:
@@ -584,6 +573,7 @@
         </tr>
        </table>
       </li>
+       <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
       <li>m5 bit 6 clear: road
        <ul>
         <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
@@ -650,7 +640,7 @@
      <ul>
       <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the depot</li>
       <li>m2: Depot index</li>
-       <li>m5 bits 1..0: exit towards:
+       <li>m5 bits 3..0: exit towards:
        <table>
         <tr>
          <td><tt>0</tt>&nbsp; </td>
@@ -673,9 +663,10 @@
         </tr>
        </table>
       </li>
-       <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
      </ul>
     </li>
+     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
    </ul>
   </td>
  </tr>
@@ -722,6 +713,7 @@
         <li>bits 7..2 : lift position (for houses type 04 and 05)</li>
        </ul>
       </li>
+       <li>bits 1..0 : tropic zone specifier</li>
      </ul>
     </li>
     <li>m7 :
@@ -843,6 +835,7 @@
       </tr>
      </table>
     </li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
    </ul>
   </td>
  </tr>
@@ -976,6 +969,7 @@
     <li>m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy, waypoint)</li>
     <li>m6 bit 2: pbs reservation state for railway stations/waypoints</li>

+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road (road stops)</li>
     <li>m7 bits 7..6: present road types (road stops)</li>
     <li>m7: animation frame (railway stations/waypoints, airports)</li>
@@ -1088,6 +1082,8 @@
       </tr>
      </table>
     </li>
+     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
    </ul>
   </td>
  </tr>
@@ -1105,7 +1101,7 @@

  <tr bgcolor="#CCCCCC">
   <td valign=top nowrap><strong><a name="Class8"><tt> 8</tt></a></strong></td>
-   <td><strong>Industries </strong></td>
+   <td><strong>Industry tile </strong></td>
  </tr>
  <tr>
   <td valign=top nowrap>&nbsp;</td>
@@ -1429,6 +1425,7 @@
     </li>
     <li>m6 bits 5..3: random triggers (NewGRF)</li>
     <li>m6 bit 2: bit 8 of type (see m5)</li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     <li>m7: animation frame</li>
    </ul>
   </td>
@@ -1579,6 +1576,8 @@
       </tr>
      </table>
     </li>
+     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road</li>
     <li>m7 bit 5 set = on snow or desert</li>
     <li>m7 bits 7..6: present road types for road</li>
@@ -1594,12 +1593,41 @@
   <td valign=top nowrap>&nbsp;</td>
   <td>
    <ul>
-     <li>m1 bits 6..5 : Water class (sea, canal, river or land)</li>
+     <li>m1 bits 6..5 : Water class (sea, canal, river or land)
     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the object (for lighthouses and transmitters normally <tt>10</tt>)</li>
-     <li>m2: index into the array of objects, bits 0 to 15 (upper bits in m5)</li>
-     <li>m3: random bits</li>
-     <li>m5: index into the array of objects, bits 16 to 23 (lower bits in m2)</li>
-     <li>m7: animation counter</li>
+     <li>m2: index into the array of objects
+     <li>m3: random bits
+     <li>m5: tile type:
+      <table>
+       <tr>
+        <td nowrap valign=top><tt>00</tt>&nbsp; </td>
+        <td align=left>transmitter</td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>01</tt>&nbsp; </td>
+        <td align=left>lighthouse</td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>02</tt>&nbsp; </td>
+        <td align=left>company statue
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>03</tt>&nbsp; </td>
+        <td align=left>company-owned land</td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>04</tt><tt></tt>&nbsp; </td>
+        <td align=left>company headquarters</td>
+       </tr>
+      </table>
+     </li>
+     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
+     <li>m7: animation counter
    </ul>
   </td>
  </tr>
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -17,7 +17,7 @@
 </head>
 <body style="direction: ltr;">
 <h3 style="font-weight: bold;">Landscape</h3>
-<span style="font-weight: bold;"></span>Nine attributes hold the information about a tile.
+<span style="font-weight: bold;"></span>Six attributes hold the information about a tile.
 This can be seen in the <a href="landscape.html">Landscape</a> document. This page tries to give an overview of used and free bits of
 the array so you can quickly see what is used and what is not.
 <ul>
@@ -28,14 +28,13 @@ the array so you can quickly see what is used and what is not.
 </ul>
 <p>
 <ul>
-  <li><span style="font-weight: bold;">type</span> - 8 bits in size, tile class (bits 4..7), bridge (bits 2..3) tropic zone (bits 0..1, only valid in tropic climate)</li>
-  <li><span style="font-weight: bold;">height</span> - 8 bits in size, stores tile height</li>
+  <li><span style="font-weight: bold;">type_height</span> - 8 bits in size, stores tile height (lower 4 bits) and tile class (upper 4 bits)</li>
  <li><span style="font-weight: bold;">m1</span> - 8 bits in size, used to identify the owner of that tile (eg piece of rail, bridge, etc.)</li>
  <li><span style="font-weight: bold;">m2</span> - 16 bits in size, used to identify the index of the given tile (object) in the (object-)array</li>
  <li><span style="font-weight: bold;">m3</span> - 8 bits in size, is used for general storage</li>
  <li><span style="font-weight: bold;">m4</span> - 8 bits in size, is used for general storage</li>
  <li><span style="font-weight: bold;">m5</span> - 8 bits in size, is used for general storage</li>
-  <li><span style="font-weight: bold;">m6</span> - 8 bits in size, is used for general storage</li>
+  <li><span style="font-weight: bold;">m6</span> - 8 bits in size, special meaning : lower 2 bits only valid in tropic climate, upper 2 bits for bridges</li>
  <li><span style="font-weight: bold;">m7</span> - 8 bits in size, is used for general storage</li>
 </ul>

@@ -43,8 +42,7 @@ the array so you can quickly see what is used and what is not.
  <tbody>
    <tr>
      <th colspan=2>class</th>
-      <th>type (8)</th>
-      <th>height (8)</th>
+      <th>type_height (8)</th>
      <th>m1 (8)</th>
      <th>m2 (16)</th>
      <th>m3 (8)</th>
@@ -57,7 +55,6 @@ the array so you can quickly see what is used and what is not.
      <td colspan=2 class="caption">bits</td>
      <td class="bits">7654 3210</td>
      <td class="bits">7654 3210</td>
-      <td class="bits">7654 3210</td>
      <td class="bits">FEDC BA98 7654 3210</td>
      <td class="bits">7654 3210</td>
      <td class="bits">7654 3210</td>
@@ -69,75 +66,69 @@ the array so you can quickly see what is used and what is not.
      <td rowspan="2">0</td>
      <td class="caption">ground</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOO</span><span class="option">~ ~~~~</span></td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
      <td class="bits">XXXX <span class="free">OOOO</span></td>
      <td class="bits">XXXX XX<span class="free">OO</span></td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOO</span>X XX<span class="free">OO</span></td>
+      <td class="bits">XX<span class="free">O</span>X XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
      <td class="caption">farmland</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOO</span>X XX<span class="free">OO</span></td>
+      <td class="bits">XX<span class="free">O</span>X XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
      <td rowspan=3>1</td>
      <td class="caption">rail</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOO</span>X XXXX</td>
      <td class="bits"><span class="free">OOOO</span> XXXX <span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO</span> XXXX</td>
      <td class="bits"><span class="free">OOOO</span> XXXX</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
      <td class="caption">rail with signals</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO</span> XXXX XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
      <td class="caption">depot</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO</span> XXXX</td>
      <td class="bits"><span class="free">OOOO</span> XXXX</td>
-      <td class="bits">XX<span class="free">O</span>X <span class="free">OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">O</span>X <span class="free">O</span>XXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
      <td rowspan=3>2</td>
      <td class="caption">road</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOO</span>X XXXX</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
+      <td class="bits">XXXX X<span class="free">O</span>XX</td>
      <td class="bits">XXX<span class="free">O</span> XXXX</td>
    </tr>
    <tr>
@@ -145,11 +136,10 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">-inherit-</td>
      <td class="bits">XXXX<span class="free"> OOO</span>X</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
+      <td class="bits">XXXX X<span class="free">O</span>XX</td>
      <td class="bits">XXXX XXXX</td>
    </tr>
    <tr>
@@ -157,50 +147,46 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX <span class="free">OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">XXX<span class="free">O</span> XXXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits">XXX<span class="free">O OOOO</span></td>
    </tr>
    <tr>
      <td>3</td>
      <td class="caption">house</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
      <td class="bits">XX<span class="free">O</span><span class="option">~ ~~</span>XX</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">XXX<span class="abuse">X XXXX</span></td>
-      <td class="bits"><span class="abuse">XXXX XX</span><span class="free">OO</span></td>
+      <td class="bits"><span class="abuse">XXXX XX</span>XX</td>
      <td class="bits">XXXX <span class="abuse">XXXX</span></td>
    </tr>
    <tr>
      <td>4</td>
      <td class="caption">trees</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOO</span><span class="option">~ ~~~~</span></td>
      <td class="bits"><span class="free">OOOO OOO</span>X XXXX XXXX</td>
      <td class="bits"><span class="option">~~</span>XX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XX<span class="free">OO O</span>XXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
      <td rowspan=7>5</td>
      <td class="caption">rail station</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">O</span>XXX XXXX</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX XX<span class="free">OO</span></td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</td>
      <td class="bits">XXXX XXXX</td>
    </tr>
    <tr>
@@ -213,18 +199,16 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
    </tr>
    <tr>
      <td class="caption">road stop</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
      <td class="bits">XXXX <span class="free">OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</td>
      <td class="bits">XX<span class="free">O</span>X XXXX</td>
    </tr>
    <tr>
@@ -232,11 +216,10 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
@@ -244,11 +227,10 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
      <td class="bits">XXXX <span class="free">OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
      <td class="bits">XXXX XXXX</td>
    </tr>
    <tr>
@@ -256,11 +238,10 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
@@ -268,75 +249,69 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
      <td rowspan=3>6</td>
      <td class="caption">sea, shore</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">O</span>XXX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">X<span class="option">~~</span>X XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
      <td class="caption">canal, river</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
      <td class="caption">shipdepot</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
      <td>8</td>
      <td class="caption">industry</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
      <td class="bits">XXX<span class="free">O</span> <span class="abuse">XXXX</span></td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX XX<span class="free">OO</span></td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</td>
      <td class="bits">XXXX XXXX</td>
    </tr>
    <tr>
      <td rowspan=2>9</td>
      <td class="caption">tunnel entrance</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOO</span>X XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">X<span class="free">OO</span>X XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits">XXXX X<span class="free">O</span>XX</td>
    </tr>
    <tr>
      <td>bridge ramp</td>
@@ -346,21 +321,19 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OO</span>XX XX<span class="free">OO</span></td>
+      <td class="bits">XXXX XXXX</td>
      <td class="bits">-inherit-</td>
    </tr>
    <tr>
      <td rowspan=2>A</td>
      <td class="caption">objects</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">O</span>XXX XXXX</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits">XXXX XXXX</td>
    </tr>
  </tbody>
--- a/docs/linkgraph.txt
+++ b/docs/linkgraph.txt
@@ -1,30 +0,0 @@
-Some clarifications about the link graph
----------------------------------------
-
-InitializeLinkGraphs joins all threads, so if the game is abandoned
-with some threads still running, they're joined as soon as the next game
-(possibly the title game) is started. See also InitializeGame.
-
-The MCF (multi-commodity flow) algorithm can be quite CPU-hungry as it's
-NP-hard and takes exponential time (though with a very small constant
-factor) in the number of nodes.
-This is why it is run in a separate thread where possible. However after
-some time the thread is joined and if it hasn't finished by then the game
-will hang. This problem gets worse if we are running on a platform without
-threads. However, as those are usually the ones with less CPU power I
-assume the contention for the CPU would make the game hard to play even
-with threads or even without cargodist (autosave ...). I might be wrong,
-but I won't put any work into this before someone shows me some problem.
-
-You can configure the link graph recalculation time. A link graph
-recalculation time of X days means that each link graph job has X days
-to run before it is joined. The downside is that the flow stats won't be
-updated before the job is finished and thus a high value means less
-updates and longer times until changes in capacities are accounted for.
-If you play a very large map with a complicated link graph you may want to
-raise the time setting to avoid lags. The same holds for systems with slow
-CPUs.
-
-Another option to avoid excessive lags is to reduce the accuracy of link
-graph calculations. Generally the accuracy is inversely correlated to the
-CPU requirements of the MCF algorithm.
--- a/docs/openttd.6
+++ b/docs/openttd.6
@@ -1,152 +1,112 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd October 13, 2014
+.Dd May 31, 2011
 .Dt OPENTTD 6
-.Os
 .Sh NAME
 .Nm openttd
-.Nd open source clone of the Microprose game \(lqTransport Tycoon Deluxe\(rq
+.Nd An open source clone of the Microprose game "Transport Tycoon Deluxe"
 .Sh SYNOPSIS
 .Nm
 .Op Fl efhx
 .Op Fl b Ar blitter
 .Op Fl c Ar config_file
-.Op Fl d Op Ar level | Ar cat Ns = Ns Ar lvl Ns Op , Ns Ar ...
-.Op Fl D Oo Ar host Oc Ns Op : Ns Ar port
-.Op Fl g Op Ar savegame
+.Op Fl d Ar [level | cat=lvl[,...]]
+.Op Fl D Ar [host][:port]
+.Op Fl g Ar [savegame]
 .Op Fl G Ar seed
 .Op Fl I Ar graphicsset
-.Op Fl l Ar host Ns Op : Ns Ar port
+.Op Fl l Ar host[:port]
 .Op Fl m Ar driver
 .Op Fl M Ar musicset
-.Op Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar player
+.Op Fl n Ar host[:port][#player]
 .Op Fl p Ar password
 .Op Fl P Ar password
 .Op Fl q Ar savegame
-.Op Fl r Ar width Ns x Ns Ar height
+.Op Fl r Ar widthxheight
 .Op Fl s Ar driver
 .Op Fl S Ar soundset
 .Op Fl t Ar year
 .Op Fl v Ar driver
 .Sh OPTIONS
-.Bl -tag -width "-n host[:port][#player]"
+.Bl -tag -width ".Fl n Ar host[:port][#player]"
 .It Fl b Ar blitter
-Select the blitter
-.Ar blitter ;
-see
+Set the blitter, see
 .Fl h
-for a full list.
+for a full list
 .It Fl c Ar config_file
-Use
-.Ar config_file
-instead of
-.Pa openttd.cfg .
+Use 'config_file' instead of 'openttd.cfg'
 .It Fl d Ar [level]
 Set debug verbosity for all categories to
-.Ar level ,
-or 1 if omitted.
-.It Fl d Ar cat Ns = Ns Ar lvl Ns Op , Ns Ar ...
-Set debug verbosity to
-.Ar lvl
-for a specific category
-.Ar cat .
-.It Fl D Oo Ar host Oc Ns Op : Ns Ar port
-Start a dedicated server.
-.Pp
-Network debug level will be set to 6.
-If you want to change this, set
+.Ar level
+or 1 if omitted
+.It Fl d Ar cat=level[,...]
+Set debug verbosity for a specific category
+.It Fl D Ar [host][:port]
+Start a dedicated server. Sets network debug level to 6. If you want to change this, use
 .Fl d
-after setting
-.Fl D .
+after
+.Fl D
+.It Fl G Ar seed
+Seed the pseudo random number generator
 .It Fl e
-Start in world editor mode.
+Start in world editor mode
 .It Fl f
 Fork into background (dedicated server only, see
-.Fl D ) .
-.It Fl g Op Ar savegame
+.Fl D )
+.It Fl g Ar [savegame]
 Load
 .Ar savegame
-at start or start a new game if omitted.
+at start or start a new game if omitted. The
 .Ar savegame
-must be either an absolute path or one relative to the current path or one of
-the search paths.
-.It Fl G Ar seed
-Seed the pseudo random number generator with
-.Ar seed .
+must be either absolute or relative to the current path or one of the search paths.
 .It Fl h
-Display a summary of all options and list all the available AIs, blitters,
-sound, music and video drivers, graphics sets and sound sets.
+Display a summary of all options and lists all the available AIs, blitters, sound, music and video drivers, graphics sets and sound sets.
 .It Fl I Ar graphicsset
-Select the graphics set
-.Ar graphicsset ;
-see
+Set the graphics set, see
 .Fl h
-for a full list.
-.It Fl l Ar host Ns Op : Ns Ar port
-Redirect
-.Fn DEBUG
-output; see
-.Fl D .
+for a full list
+.It Fl l Ar host[:port]
+Redirect DEBUG(), See
+.Fl D
 .It Fl m Ar driver
-Select the music driver
-.Ar driver ;
-see
+Set the music driver, see
 .Fl h
-for a full list.
+for a full list
 .It Fl M Ar musicset
-Select the music set
-.Ar musicset ;
-see
+Set the music set, see
 .Fl h
-for a full list.
-.It Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar player
-Join a network game, optionally specifying a port to connect to and player to
-play as.
+for a full list
+.It Fl n Ar host[:port][#player]
+Join a network game, optionally specify a port to connect to and player to play as
 .It Fl p Ar password
-Password used to join server.
-Only useful with
-.Fl n .
+Password used to join server. Only useful with
+.Fl n
 .It Fl P Ar password
-Password used to join company.
-Only useful with
-.Fl n .
+Password used to join company. Only useful with
+.Fl n
 .It Fl q Ar savegame
-Write some information about the specified savegame and exit.
-.It Fl r Ar width Ns x Ns Ar height
-Set the resolution to
-.Ar width
-\(mu
-.Ar height
-pixels.
+Write some information about the savegame and exit
+.It Fl r Ar widthxheight
+Set the resolution
 .It Fl s Ar driver
-Select the sound driver
-.Ar driver ;
-see
+Set the sound driver, see
 .Fl h
-for a full list.
+for a full list
 .It Fl S Ar soundset
-Select the sound set
-.Ar soundset ;
-see
+Set the sound set, see
 .Fl h
-for a full list.
+for a full list
 .It Fl t Ar year
-Set the starting year to
-.Ar year .
+Set the starting year
 .It Fl v Ar driver
-Select the video driver
-.Ar driver ;
-see
+Set the video driver, see
 .Fl h
-for a full list.
+for a full list
 .It Fl x
-Do not automatically save to config file on exit.
+Do not automatically save to config file on exit
 .El
 .Sh SEE ALSO
-.Lk https://wiki.openttd.org "Wiki"
-(includes community maintained manual),
-.Lk https://forum.openttd.org "Forum",
-.Lk https://www.openttd.org "News"
+http://wiki.openttd.org/, http://www.openttd.org
 .Sh HISTORY
 Transport Tycoon Deluxe was written by Chris Sawyer and published by Microprose.
 .Nm
--- a/findversion.sh
+++ b/findversion.sh
@@ -70,7 +70,7 @@ ROOT_DIR=`pwd`
 # Determine if we are using a modified version
 # Assume the dir is not modified
 MODIFIED="0"
-if [ -d "$ROOT_DIR/.svn" ] || [ -d "$ROOT_DIR/../.svn" ]; then
+if [ -d "$ROOT_DIR/.svn" ]; then
 	# We are an svn checkout
 	if [ -n "`svnversion | grep 'M'`" ]; then
 		MODIFIED="2"
@@ -106,21 +106,21 @@ elif [ -d "$ROOT_DIR/.git" ]; then
 	fi
 elif [ -d "$ROOT_DIR/.hg" ]; then
 	# We are a hg checkout
-	if [ -n "`HGPLAIN= hg status | grep -v '^?'`" ]; then
+	if [ -n "`hg status | grep -v '^?'`" ]; then
 		MODIFIED="2"
 	fi
-	HASH=`LC_ALL=C HGPLAIN= hg id -i | cut -c1-12`
+	HASH=`LC_ALL=C hg id -i | cut -c1-12`
 	REV="h`echo $HASH | cut -c1-8`"
-	BRANCH="`HGPLAIN= hg branch | sed 's@^default$@@'`"
-	TAG="`HGPLAIN= hg id -t | grep -v 'tip$'`"
+	BRANCH="`hg branch | sed 's@^default$@@'`"
+	TAG="`hg id -t | grep -v 'tip$'`"
 	if [ -n "$TAG" ]; then
 		BRANCH=""
 		REV="$TAG"
 	fi
-	REV_NR=`LC_ALL=C HGPLAIN= hg log -f -k "(svn r" -l 1 --template "{desc|firstline}\n" | grep "^(svn r[0-9]*)" | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
+	REV_NR=`LC_ALL=C hg log -f -k "(svn r" -l 1 --template "{desc|firstline}\n" | grep "^(svn r[0-9]*)" | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
 	if [ -z "$REV_NR" ]; then
 		# No rev? Maybe it is a custom hgsubversion clone
-		REV_NR=`LC_ALL=C HGPLAIN= hg parent --template="{svnrev}"`
+		REV_NR=`LC_ALL=C hg parent --template="{svnrev}"`
 	fi
 elif [ -f "$ROOT_DIR/.ottdrev" ]; then
 	# We are an exported source bundle
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,13 +1,14 @@
 OpenTTD's known bugs
-Last updated:    2018-03-21
-Release version: 1.8.0-RC1
+Last updated:    2012-02-19
+Release version: 1.2.0-RC1
 ------------------------------------------------------------------------


 Table of contents
 -----------------
 1.0) About
-2.0) Known bugs
+2.0) Known bugs in this release
+ * 2.1) Known bugs that will not be solved


 1.0) About
@@ -16,13 +17,36 @@ All bugs listed below are marked as known. Please do not submit any bugs
 that are the same as these. If you do, do not act surprised, because
 we WILL flame you!!

-The current list of known bugs that we intend to fix can be found in our
-bug tracking system at: http://bugs.openttd.org
-Also check the closed bugs when searching for your bug in this system as
-we might have fixed the bug in the mean time.
+Of course if you have more knowledge about any of these bugs, have more
+specifics, we welcome you to report them. React to the given bug indicated
+by the number below on http://bugs.openttd.org.


-2.0) Known bugs
+2.0) Known bugs in this release
+---- --------------------------
+The following bugs are known to exist in this release and we intend to
+fix them. Some bugs are known but are not fixable or fixing them would
+cause further problems. Those bugs can be found in the "Known bugs that
+will not be solved" section.
+
+The bugs in this section all refer to a ticket in our bug tracking system
+that you can find at: http://bugs.openttd.org
+If the bugs are closed but still listed here it means that the bug is fixed
+and that the nightlies and next major release will not have that bug.
+
+Issues prefixed with [OSX] are required to be fixed before we consider
+officially supporting Mac OS X again. For now it remains unsupported and
+we only apply bug fixes provided by the community but we are unable to fix
+these bugs ourselves.
+
+- 4857	[OSX] No support for detecting mono space font
+- 4847	[OSX] No support for bootstrap downloading of base graphics
+- 4744  [OSX] Crash when switching to full screen with OS X Lion
+- 4689  [OSX] Crash when hiding window after coming from full screen
+- 4420  [OSX] OS' mouse pointer still shows
+- 2484  [OSX] Cannot enter CJK characters
+
+2.1) Known bugs that will not be solved
 ---- ----------------------------------
 This section lists all known bugs that we do not intend to fix and the
 reasons why we think that fixing them is infeasible. We might make some
@@ -33,13 +57,12 @@ No suitable AI can be found
 	If you have no AIs and an AI is started the so-called 'dummy' AI will
 	be loaded. This AI does nothing but writing a message on the AI debug
 	window and showing a red warning. There are basically two solutions
-	for this problem: Either you set the number of AI players to 0 so that
-	no AI is started. You find that setting at the top of the window in the
-	"AI / Game Scripts Settings" window.
-	The other solution is acquiring (downloading) some AI. The easiest way
-	to do this is via the "Check Online Content" button in the main (intro)
-	menu or directly in the "AI / Game Scripts Settings" dialogue via the
-	"Check Online Content" button.
+	for this problem: you must change the settings so no AI is started,
+	this is done in the difficulty settings window. The other solution is
+	acquiring (downloading) some AI. The easiest way to do this is via
+	the "Check Online Content" button in the main (intro) menu or via
+	"AI Settings" -> "Select AI" -> "Check Online Content" which is also
+	accessed via the main menu.

 After a while of playing, colours get corrupted
 	In Windows 7 the background slideshow corrupts the colour mapping of
@@ -404,52 +427,3 @@ Mouse cursor going missing with SDL [FS#4997]:
 	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.
-
-Inconsistent catchment areas [FS#5661]:
-	Due to performance decisions the catchment area for cargo accepted
-	by a station for delivery to houses or industries differs from the
-	catchment area for cargo that is delivered to stations from houses
-	or industries.
-
-	Conceptually they work the same, but the effect in game differs.
-	They work by finding the closest destination "around" the source
-	which is within a certain distance. This distance depends on the
-	type of station, e.g. road stops have a smaller catchment area than
-	large airports. In both cases the bounding box, the smallest
-	rectangle that contains all tiles of something, is searched for the
-	target of the cargo, and then spiraling outwards finding the closest
-	tile of the target.
-
-	In the case of a station with two tiles spread far apart with a house
-	that is within the station's bounding box, it would be possible that
-	the spiraling search from the house does not reach one of the station
-	tiles before the search ends, i.e. all tiles within that distance
-	are searched. So the house does not deliver cargo to the station. On
-	the other hand, the station will deliver cargo because the house
-	falls within the bounding box, and thus search area.
-
-	It is possible to make these consistent, but then cargo from a house
-	to a station needs to search up to 32 tiles around itself, i.e. 64
-	by 64 tiles, to find all possible stations it could deliver to
-	instead of 10 by 10 tiles (40 times more tiles). Alternatively the
-	search from a station could be changed to use the actual tiles, but
-	that would require considering checking 10 by 10 tiles for each of
-	the tiles of a station, instead of just once.
-
-Trains might not stop at platforms that are currently being changed [FS#5553]:
-	If you add tiles to or remove tiles from a platform while a train is
-	approaching to stop at the same platform, that train can miss the place
-	where it's supposed to stop and pass the station without stopping. This
-	is caused by the fact that the train is considered to already have stopped
-	if it's beyond its assigned stopping location. We can't let the train stop
-	just anywhere in the station because then it would never leave the station
-	if you have the same station in the order list multiple times in a row or
-	if there is only one station in the order list (see FS#5684).
-
-Some houses and industries are not affected by transparency [FS#5817]:
-	Some of the default houses and industries (f.e. the iron ore mine) are
-	not affected by the transparency options. This is because the graphics do
-	not (completely) separate the ground from the building.
-	This is a bug of the original graphics, and unfortunately cannot be
-	fixed with OpenGFX for the sake of maintaining compatibility with the
-	original graphics.
--- a/media/baseset/no_music.obm
+++ b/media/baseset/no_music.obm
@@ -1,50 +0,0 @@
-; $Id$
-;
-; This represents more or less nothingness
-;
-[metadata]
-name              = NoMusic
-shortname         = NULL
-version           = 0
-fallback          = true
-!! description STR_BASEMUSIC_NONE_DESCRIPTION
-
-[files]
-theme =
-old_0 =
-old_1 =
-old_2 =
-old_3 =
-old_4 =
-old_5 =
-old_6 =
-old_7 =
-old_8 =
-old_9 =
-new_0 =
-new_1 =
-new_2 =
-new_3 =
-new_4 =
-new_5 =
-new_6 =
-new_7 =
-new_8 =
-new_9 =
-ezy_0 =
-ezy_1 =
-ezy_2 =
-ezy_3 =
-ezy_4 =
-ezy_5 =
-ezy_6 =
-ezy_7 =
-ezy_8 =
-ezy_9 =
-
-[md5s]
-
-[names]
-
-[origin]
-default      = This file was part of your OpenTTD installation.
--- a/media/baseset/no_sound.obs
+++ b/media/baseset/no_sound.obs
@@ -1,18 +0,0 @@
-; $Id$
-;
-; This represents more or less nothingness
-;
-[metadata]
-name              = NoSound
-shortname         = NULL
-version           = 2
-fallback          = true
-!! description STR_BASESOUNDS_NONE_DESCRIPTION
-
-[files]
-samples      =
-
-[md5s]
-
-[origin]
-default      = This file was part of your OpenTTD installation.
--- a/media/baseset/orig_dos.obg
+++ b/media/baseset/orig_dos.obg
@@ -1,31 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the non-German Transport
-; Tycoon Deluxe DOS CD.
-;
-[metadata]
-name              = original_dos
-shortname         = TTDD
-version           = 1
-palette           = DOS
-!! description STR_BASEGRAPHICS_DOS_DESCRIPTION
-
-[files]
-base              = TRG1.GRF
-logos             = TRGI.GRF
-arctic            = TRGC.GRF
-tropical          = TRGH.GRF
-toyland           = TRGT.GRF
-extra             = ORIG_EXTRA.GRF
-
-[md5s]
-TRG1.GRF          = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF          = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF          = ed446637e034104c5559b32c18afe78d
-TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF          = e30e8a398ae86c03dc534a8ac7dfb3b6
-ORIG_EXTRA.GRF    =
-
-[origin]
-default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.
--- a/media/baseset/orig_dos.obs
+++ b/media/baseset/orig_dos.obs
@@ -1,19 +0,0 @@
-; $Id$
-;
-; This represents the original sounds as on the Transport
-; Tycoon Deluxe DOS CD.
-;
-[metadata]
-name              = original_dos
-shortname         = TTDO
-version           = 0
-!! description STR_BASESOUNDS_DOS_DESCRIPTION
-
-[files]
-samples      = SAMPLE.CAT
-
-[md5s]
-SAMPLE.CAT   = 422ea3dd074d2859bb51639a6e0e85da
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/media/baseset/orig_dos_de.obg
+++ b/media/baseset/orig_dos_de.obg
@@ -1,31 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the German Transport
-; Tycoon Deluxe DOS CD. It contains one broken sprite.
-;
-[metadata]
-name              = original_dos_de
-shortname         = TTDD
-version           = 0
-palette           = DOS
-!! description STR_BASEGRAPHICS_DOS_DE_DESCRIPTION
-
-[files]
-base              = TRG1.GRF
-logos             = TRGI.GRF
-arctic            = TRGC.GRF
-tropical          = TRGH.GRF
-toyland           = TRGT.GRF
-extra             = ORIG_EXTRA.GRF
-
-[md5s]
-TRG1.GRF          = 9311676280e5b14077a8ee41c1b42192
-TRGI.GRF          = da6a6c9dcc451eec88d79211437b76a8
-TRGC.GRF          = ed446637e034104c5559b32c18afe78d
-TRGH.GRF          = ee6616fb0e6ef6b24892c58c93d86fc9
-TRGT.GRF          = fcde1d7e8a74197d72a62695884b909e
-ORIG_EXTRA.GRF    =
-
-[origin]
-default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.
--- a/media/baseset/orig_win.obg
+++ b/media/baseset/orig_win.obg
@@ -1,31 +0,0 @@
-; $Id$
-;
-; This represents the original graphics as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name              = original_windows
-shortname         = TTDW
-version           = 0
-palette           = Windows
-!! description STR_BASEGRAPHICS_WIN_DESCRIPTION
-
-[files]
-base              = TRG1R.GRF
-logos             = TRGIR.GRF
-arctic            = TRGCR.GRF
-tropical          = TRGHR.GRF
-toyland           = TRGTR.GRF
-extra             = ORIG_EXTRA.GRF
-
-[md5s]
-TRG1R.GRF         = b04ce593d8c5016e07473a743d7d3358
-TRGIR.GRF         = 0c2484ff6be49fc63a83be6ab5c38f32
-TRGCR.GRF         = 3668f410c761a050b5e7095a2b14879b
-TRGHR.GRF         = 06bf2b7a31766f048baac2ebe43457b1
-TRGTR.GRF         = de53650517fe661ceaa3138c6edb0eb8
-ORIG_EXTRA.GRF    =
-
-[origin]
-default           = You can find it on your Transport Tycoon Deluxe CD-ROM.
-ORIG_EXTRA.GRF    = This file was part of your OpenTTD installation.
--- a/media/baseset/orig_win.obm
+++ b/media/baseset/orig_win.obm
@@ -1,94 +0,0 @@
-; $Id$
-;
-; This represents the original music as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name              = original_windows
-shortname         = TTDW
-version           = 1
-!! description STR_BASEMUSIC_WIN_DESCRIPTION
-
-[files]
-theme = GM_TT00.GM
-old_0 = GM_TT02.GM
-old_1 = GM_TT06.GM
-old_2 = GM_TT03.GM
-old_3 = GM_TT12.GM
-old_4 = GM_TT08.GM
-old_5 = GM_TT13.GM
-old_6 = GM_TT14.GM
-old_7 = GM_TT10.GM
-old_8 =
-old_9 =
-new_0 = GM_TT04.GM
-new_1 = GM_TT01.GM
-new_2 = GM_TT05.GM
-new_3 = GM_TT15.GM
-new_4 = GM_TT11.GM
-new_5 = GM_TT16.GM
-new_6 = GM_TT09.GM
-new_7 =
-new_8 =
-new_9 =
-ezy_0 = GM_TT18.GM
-ezy_1 = GM_TT19.GM
-ezy_2 = GM_TT21.GM
-ezy_3 = GM_TT17.GM
-ezy_4 = GM_TT20.GM
-ezy_5 = GM_TT07.GM
-ezy_6 =
-ezy_7 =
-ezy_8 =
-ezy_9 =
-
-[md5s]
-GM_TT00.GM = 45cfec1b9d8c7a0ad45e755833cbf221
-GM_TT01.GM = ab14ed3392d848abd2a2e90a9d75d121
-GM_TT02.GM = dd4f696e4be5987ce738257b08b50171
-GM_TT03.GM = a1bfde23343df9e4063419bf29c166b8
-GM_TT04.GM = 4e6943aa0c455203d76c79389054747d
-GM_TT05.GM = cee281cb85a2e2343552d97640545a47
-GM_TT06.GM = 26d1de5efa8675f94065784e9d539e49
-GM_TT07.GM = 6f2691e17558f552ec4c565e4ab7139c
-GM_TT08.GM = a42bf2cb3340a822f1a69646fc7a487d
-GM_TT09.GM = eb35761a58a8df3c59ed8929cce13916
-GM_TT10.GM = 42fecd686720a785d20a78590c466a82
-GM_TT11.GM = 50ef1ef02e49d2112786dd45e69dc3ee
-GM_TT12.GM = 4ce707a0e0e72419f0681dd9bd95271b
-GM_TT13.GM = e765753be29d889ec818f38009103619
-GM_TT14.GM = 270e2d63bd32b95a4d007ce15a6ce45f
-GM_TT15.GM = 89e116a1c0c69f1845cc903a9bfbe460
-GM_TT16.GM = f824e2371b3bedfe61aad4b9c62dd6be
-GM_TT17.GM = 1b23eebb0796c1ab99cd97fa7082cf7b
-GM_TT18.GM = 15650de3bad645d0e88c4f5c7a2df92a
-GM_TT19.GM = 7aec079e15bd09588660b85545ac4dfc
-GM_TT20.GM = 1509097889dee617aa1e9a1738a5a930
-GM_TT21.GM = a8d0aaad02e1a762d8d54cf81da56bab
-
-[names]
-GM_TT00.GM = Tycoon DELUXE Theme
-GM_TT01.GM = Snarl Up
-GM_TT02.GM = Easy Driver
-GM_TT03.GM = Little Red Diesel
-GM_TT04.GM = City Groove
-GM_TT05.GM = Aliens Ate My Railway
-GM_TT06.GM = Stoke It
-GM_TT07.GM = Don't Walk!
-GM_TT08.GM = Sawyer's Tune
-GM_TT09.GM = Fell Apart On Me
-GM_TT10.GM = Can't Get There From Here
-GM_TT11.GM = Hard Drivin'
-GM_TT12.GM = Road Hog
-GM_TT13.GM = Hold That Train!
-GM_TT14.GM = Broomer's Oil Rag
-GM_TT15.GM = Goss Groove
-GM_TT16.GM = Small Town
-GM_TT17.GM = Cruise Control
-GM_TT18.GM = Stroll On
-GM_TT19.GM = Funk Central
-GM_TT20.GM = Jammit
-GM_TT21.GM = Movin' On
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/media/baseset/orig_win.obs
+++ b/media/baseset/orig_win.obs
@@ -1,19 +0,0 @@
-; $Id$
-;
-; This represents the original sounds as on the Transport
-; Tycoon Deluxe for Windows CD.
-;
-[metadata]
-name              = original_windows
-shortname         = TTDO
-version           = 0
-!! description STR_BASESOUNDS_WIN_DESCRIPTION
-
-[files]
-samples      = SAMPLE.CAT
-
-[md5s]
-SAMPLE.CAT   = 9212e81e72badd4bbe1eaeae66458e10
-
-[origin]
-default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/media/baseset/translations.awk
+++ b/media/baseset/translations.awk
@@ -1,69 +0,0 @@
-# $Id: openttd.desktop.translation.awk 24100 2012-04-08 14:29:31Z rubidium $
-
-# 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/>.
-
-#
-# Awk script to extract translations for baseset descriptions
-# from lang files for insertion into .obg/obs/obm files.
-# If there is no translation, there is no output.
-#
-# The input file is scanned for the pattern
-#  !! <ini-key> <STR_id>
-#
-# The lang files (passed as variable 'langfiles') are scanned for <STR_id> and
-# the translations are added to the output file:
-#  <ini-key>.<iso-code> = <translation>
-#
-
-# Simple insertion sort since not all AWKs have a sort implementation
-function isort(A) {
-	n = 0
-	for (val in A) {
-		n++;
-	}
-
-	for (i = 2; i <= n; i++) {
-		j = i;
-		hold = A[j]
-		while (A[j - 1] > hold) {
-			j--;
-			A[j + 1] = A[j]
-		}
-		A[j] = hold
-	}
-
-	return n
-}
-
-/^!!/ {
-	ini_key = $2;
-	str_id = $3;
-
-	file = langfiles
-	while ((getline < file) > 0) {
-		if (match($0, "##isocode") > 0) {
-			lang = $2;
-		} else if (match($0, "^" str_id " *:") > 0) {
-			sub("^[^:]*:", "", $0)
-			i++;
-			if (lang == "en_GB") {
-				texts[i] = ini_key "       = "$0;
-			} else {
-				texts[i] = ini_key "." lang " = "$0;
-			}
-		}
-	}
-	close(file);
-
-	count = isort(texts);
-	for (i = 1; i <= count; i++) {
-		print texts[i]
-	}
-
-	next
-}
-
-{ print }
--- 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,31 +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 * 0	 0C "Climate specific sprites by PaulC"
-   -1 * 0	 07 83 01 \7! 01 03
-   -1 * 0	 05 90 02 0D
-   -1 sprites/airports.png 8bpp 320   88  64  31 -31   0 normal
-   -1 sprites/airports.png 8bpp 400   88  64  31 -31   0 normal
-   -1 * 0	 07 83 01 \7! 02 03
-   -1 * 0	 05 90 02 0D
-   -1 sprites/airports.png 8bpp 480   88  64  31 -31   0 normal
-   -1 sprites/airports.png 8bpp 560   88  64  31 -31   0 normal
-   -1 * 0	 07 83 01 \7! 03 03
-   -1 * 0	 05 90 02 0D
-   -1 sprites/airports.png 8bpp 640   88  64  31 -31   0 normal
-   -1 sprites/airports.png 8bpp 720   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/airports.png
+++ b/media/extra_grf/airports.png
--- a/media/extra_grf/airports_orig_extra.nfo
+++ b/media/extra_grf/airports_orig_extra.nfo
@@ -1,12 +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 * 0	 0C "Climate specific airport sprite by PaulC"
-   -1 * 0	 07 83 01 \7! 03 02
-   -1 * 0	 0A 01 01 2F 08
-   -1 sprites/airports.png 8bpp  20  170  42  39 -19 -21 normal
--- 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/assemble_nfo.awk
+++ b/media/extra_grf/assemble_nfo.awk
@@ -1,32 +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/>.
-
-BEGIN {
-	# Very basic variant function; barely any error checking.
-	# Just use the first argument as the file to start from when assembling everything
-	path = ARGV[1];
-	gsub("[^/\\\\]*$", "", path);
-	assemble(ARGV[1]);
-}
-
-# Recursive function for assembling by means of resolving the #includes.
-function assemble(filename) {
-	while ((getline < filename) > 0) {
-		if (NF == 2 && $1 == "#include" ) {
-			# Remove the quotes.
-			gsub("[\"'<>]", "", $2);
-			assemble(path $2);
-		} else {
-			print $0;
-		}
-	}
-
-	if (close(filename) < 0) {
-		print "Could not open " filename > "/dev/stderr";
-		exit -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
@@ -6,74 +6,166 @@
 // 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 * 0	 0C "Canal graphics by George"
+   -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  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  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
+   -1 * 6        07 83 01 \7! 01 01
+   -1 * 7        03 05 01 02 00 12 00
+
+// Canal edges (tropic desert)
+   -1 * 4        01 05 01 \b12
+   -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  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
+   -1 * 6        07 83 01 \7! 02 01
+   -1 * 7        03 05 01 02 00 15 00
+
+// Canal edges (toyland)
+   -1 * 4        01 05 01 \b12
+   -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/canals_extra.nfo
+++ b/media/extra_grf/canals_extra.nfo
@@ -1,101 +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 * 0	 0C "Extra canal graphics by PaulC"
-
-// 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 * 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 * 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
-   -1 * 6        07 83 01 \7! 01 01
-   -1 * 7        03 05 01 02 00 12 00
-
-// 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 * 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 * 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
-   -1 * 6        07 83 01 \7! 02 01
-   -1 * 7        03 05 01 02 00 15 00
-
-// 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 * 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_orig_extra.nfo
+++ b/media/extra_grf/chars_orig_extra.nfo
@@ -1,249 +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 * 0	 0C "Font characters by PaulC, Bilbo and Jasper Vries"
-
-// Replace original characters
-
-   -1 * 5	 0A 01 02 41 00
-   -1 sprites/chars.png 8bpp  10   10   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  20   10   4  12   0  -1 normal
-   -1 * 5	 0A 01 02 86 00
-   -1 sprites/chars.png 8bpp  50   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  70   10   9  12   0  -1 normal
-   -1 * 5	 0A 01 01 8A 00
-   -1 sprites/chars.png 8bpp 120   10   6  12   0  -1 normal
-   -1 * 5	 0A 01 01 A0 00
-   -1 sprites/chars.png 8bpp 230   10  10  12   0  -1 normal
-   -1 * 5	 0A 01 04 A2 00
-   -1 sprites/chars.png 8bpp 260   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 290   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 320   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 350   10   8  12   0  -1 normal
-   -1 * 5	 0A 01 06 A7 00
-   -1 sprites/chars.png 8bpp 410   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 440   10  12  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 470   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 480   10   7  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 500   10   7  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 520   10   7  12   0  -1 normal
-   -1 * 5	 0A 01 03 AE 00
-   -1 sprites/chars.png 8bpp 560   10   4  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 570   10   4  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 580   10   5  12   0  -1 normal
-   -1 * 5	 0A 01 05 B3 00
-   -1 sprites/chars.png 8bpp 620   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 640   10   9  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 660   10   9  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 680   10   9  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 700   10   9  12   0  -1 normal
-   -1 * 5	 0A 01 03 BB 00
-   -1 sprites/chars.png 8bpp 770   10   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  10   70   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  30   70   8  12   0  -1 normal
-   -1 * 5	 0A 01 01 BF 00
-   -1 sprites/chars.png 8bpp  70   70   9  12   0  -1 normal
-   -1 * 5	 0A 01 05 C1 00
-   -1 sprites/chars.png 8bpp 450   70   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 110   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 120   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 130   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 140   70   6  12   0  -1 normal
-   -1 * 5	 0A 01 01 C7 00
-   -1 sprites/chars.png 8bpp 160   70   6  12   0  -1 normal
-   -1 * 5	 0A 01 03 CA 00
-   -1 sprites/chars.png 8bpp 200   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 210   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 220   70   6  12   0  -1 normal
-   -1 * 5	 0A 01 04 CE 00
-   -1 sprites/chars.png 8bpp 230   70   4  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 240   70   4  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 250   70   5  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 260   70   5  12   0  -1 normal
-   -1 * 5	 0A 01 05 D3 00
-   -1 sprites/chars.png 8bpp 290   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 310   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 320   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 330   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 340   70   6  12   0  -1 normal
-   -1 * 5	 0A 01 03 DB 00
-   -1 sprites/chars.png 8bpp 390   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 400   70   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 410   70   6  12   0  -1 normal
-   -1 * 5	 0A 01 02 DF 00
-   -1 sprites/chars.png 8bpp 420   70   7  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 430   70   6  12   0  -1 normal
-   -1 * 5	 0A 01 01 22 01
-   -1 sprites/chars.png 8bpp  20   30   2   7   0   0 normal
-   -1 * 5	 0A 01 01 7D 01
-   -1 sprites/chars.png 8bpp 220   30   4   7   0   0 normal
-   -1 * 5	 0A 01 02 80 01
-   -1 sprites/chars.png 8bpp 230   30   9   7   0   0 normal
-   -1 sprites/chars.png 8bpp 250   30   3   7   0   0 normal
-   -1 * 5	 0A 01 01 89 01
-   -1 sprites/chars.png 8bpp 470   30   3   7   0   0 normal
-   -1 * 5	 0A 01 01 9F 01
-   -1 sprites/chars.png 8bpp  70   90   3   7   0   0 normal
-   -1 * 5	 0A 01 01 A9 01
-   -1 sprites/chars.png 8bpp 190   90   3   7   0   0 normal
-   -1 * 5	 0A 01 02 BF 01
-   -1 sprites/chars.png 8bpp 420   90   3   7   0   0 normal
-   -1 sprites/chars.png 8bpp 430   90   3   7   0   0 normal
-   -1 * 5	 0A 01 01 02 02
-   -1 sprites/chars.png 8bpp  20   40   4  21   0  -2 normal
-   -1 * 5	 0A 01 01 41 02
-   -1 sprites/chars.png 8bpp  30   40  14  21   0  -2 normal
-   -1 * 5	 0A 01 06 46 02
-   -1 sprites/chars.png 8bpp  50   40  10  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  70   40  14  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  90   40   3  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 100   40  13  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 120   40   7  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 130   40  16  21   0  -2 normal
-   -1 * 5	 0A 01 01 50 02
-   -1 sprites/chars.png 8bpp 150   40  16  21   0  -2 normal
-   -1 * 5	 0A 01 04 52 02
-   -1 sprites/chars.png 8bpp 170   40   8  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 180   40   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 190   40   6  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 200   40   6  21   0  -2 normal
-   -1 * 5	 0A 01 01 5C 02
-   -1 sprites/chars.png 8bpp 210   40   7  21   0  -2 normal
-   -1 * 5	 0A 01 01 60 02
-   -1 sprites/chars.png 8bpp 230   40  16  21   0  -2 normal
-   -1 * 5	 0A 01 07 62 02
-   -1 sprites/chars.png 8bpp 260   40  20  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 290   40  20  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 320   40  20  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 350   40  20  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 380   40  20  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 410   40  20  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 440   40  24  21   0  -2 normal
-   -1 * 5	 0A 01 18 6A 02
-   -1 sprites/chars.png 8bpp 480   40  14  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 500   40  14  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 520   40  14  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 540   40  14  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 560   40   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 570   40   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 580   40   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 590   40   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 600   40  17  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 620   40  18  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 640   40  15  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 660   40  15  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 680   40  15  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 700   40  15  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 720   40  15  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 740   40   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 750   40  16  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 770   40  17  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  10  100  17  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  30  100  17  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  50  100  17  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  70  100  14  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  90  100  14  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 450  100  14  21   0  -2 normal
-   -1 * 5	 0A 01 01 85 02
-   -1 sprites/chars.png 8bpp 140  100  12  21   0  -2 normal
-   -1 * 5	 0A 01 01 88 02
-   -1 sprites/chars.png 8bpp 170  100  19  21   0  -2 normal
-   -1 * 5	 0A 01 02 92 02
-   -1 sprites/chars.png 8bpp 270  100  11  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 290  100  15  21   0  -2 normal
-   -1 * 5	 0A 01 01 97 02
-   -1 sprites/chars.png 8bpp 340  100  11  21   0  -2 normal
-   -1 * 5	 0A 01 02 99 02
-   -1 sprites/chars.png 8bpp 360  100   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 370  100  11  21   0  -2 normal
-   -1 * 5	 0A 01 01 A0 02
-   -1 sprites/chars.png 8bpp 430  100  14  21   0  -2 normal
-
-// New characters, all fonts except monospaced
-
-// U+007B: Left Curly Bracket
-// U+007C: Vertical Line
-// U+007D: Right Curly Bracket
-// U+007E: Tilde
-   -1 * 14	 12 03 00 04 7B 00 01 04 7B 00 02 04 7B 00
-   -1 sprites/chars.png 8bpp  10  130   5  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  20  130   3  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  30  130   5  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  50  130   7  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  10  150   3   7   0   0 normal
-   -1 sprites/chars.png 8bpp  20  150   1   7   0   0 normal
-   -1 sprites/chars.png 8bpp  30  150   3   7   0   0 normal
-   -1 sprites/chars.png 8bpp  50  150   4   7   0   0 normal
-   -1 sprites/chars.png 8bpp  10  160   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  20  160   3  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  30  160   9  21   0  -2 normal
-   -1 sprites/chars.png 8bpp  50  160  10  21   0  -2 normal
-
-// U+007F: No-Break Space
-   -1 * 14	 12 03 00 01 7F 00 01 01 7F 00 02 01 7F 00
-   -1 sprites/chars.png 8bpp  70  130   2  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  70  150   1   7   0   0 normal
-   -1 sprites/chars.png 8bpp  70  160   5  21   0  -2 normal
-
-// U+00AA: Feminine Ordinal Indicator
-   -1 * 14	 12 03 00 01 AA 00 01 01 AA 00 02 01 AA 00
-   -1 sprites/chars.png 8bpp  80  130   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  80  150   3   7   0   0 normal
-   -1 sprites/chars.png 8bpp  80  160   7  21   0  -2 normal
-
-// U+00AC: Not Sign
-// U+00AD: Soft Hyphen
-   -1 * 14	 12 03 00 02 AC 00 01 02 AC 00 02 02 AC 00
-   -1 sprites/chars.png 8bpp  90  130   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 110  130   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp  90  150   4   7   0   0 normal
-   -1 sprites/chars.png 8bpp 110  150   3   7   0   0 normal
-   -1 sprites/chars.png 8bpp  90  160  12  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 110  160   9  21   0  -2 normal
-
-// U+00AF: Macron
-   -1 * 14	 12 03 00 01 AF 00 01 01 AF 00 02 01 AF 00
-   -1 sprites/chars.png 8bpp 130  130   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 130  150   3   7   0   0 normal
-   -1 sprites/chars.png 8bpp 130  160  12  21   0  -2 normal
-
-// U+00B4: Acute Accent
-// U+00B5: Micro Sign
-// U+00B6: Pilcrow Sign
-// U+00B7: Middle Dot
-// U+00B8: Cedilla
-// U+00B9: Superscript One
-   -1 * 14	 12 03 00 06 B4 00 01 06 B4 00 02 06 B4 00
-   -1 sprites/chars.png 8bpp 150  130   4  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 160  130   6  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 180  130   8  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 200  130   3  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 210  130   4  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 220  130   5  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 150  150   2   7   0   0 normal
-   -1 sprites/chars.png 8bpp 160  150   3   7   0   0 normal
-   -1 sprites/chars.png 8bpp 180  150   6   7   0   0 normal
-   -1 sprites/chars.png 8bpp 200  150   1   7   0   0 normal
-   -1 sprites/chars.png 8bpp 210  150   2   7   0   0 normal
-   -1 sprites/chars.png 8bpp 220  150   2   7   0   0 normal
-   -1 sprites/chars.png 8bpp 150  160   4  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 160  160  15  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 180  160  13  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 200  160   3  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 210  160   5  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 220  160   6  21   0  -2 normal
-
-// U+00BC: Vulgar Fraction One Quarter
-// U+00BD: Vulgar Fraction One Half
-   -1 * 14	 12 03 00 02 BC 00 01 02 BC 00 02 02 BC 00
-   -1 sprites/chars.png 8bpp 230  130  10  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 250  130  10  12   0  -1 normal
-   -1 sprites/chars.png 8bpp 230  150   9   7   0   0 normal
-   -1 sprites/chars.png 8bpp 250  150   9   7   0   0 normal
-   -1 sprites/chars.png 8bpp 230  160  16  21   0  -2 normal
-   -1 sprites/chars.png 8bpp 250  160  16  21   0  -2 normal
--- 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/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.
 //
@@ -60,11 +67,10 @@
             00

 // GRF ID, must start with FF so it gets ignored
-//@@WARNING DISABLE 101
-   -1 * 0	 08 08 FF FF FF FE
+   -1 * 0	 08 08 FF "OTT"

 // Name of the GRF
-             "OpenTTD's default and fallback extra graphics" 00
+             "OpenTTD's base graphics " 00

 // Description of the GRF.
             "License: GNU General Public License version 2" 0D
@@ -87,6 +93,7 @@
 #include "canals.nfo"
 #include "oneway.nfo"
 #include "tramtracks.nfo"
+#include "shore.nfo"
 #include "sloped_tracks.nfo"
 #include "airports.nfo"
 #include "roadstops.nfo"
@@ -97,5 +104,10 @@
 #include "airport_preview.nfo"
 #include "chars.nfo"
 #include "mono.nfo"
+#include "fix_graphics.nfo"
+#include "rivers/rapids.nfo"
+#include "rivers/temperate.nfo"
+#include "rivers/arctic.nfo"
+#include "rivers/tropic.nfo"
+#include "rivers/toyland.nfo"
 #include "tunnel_portals.nfo"
-#include "palette.nfo"
--- a/media/extra_grf/openttdgui.nfo
+++ b/media/extra_grf/openttdgui.nfo
@@ -5,181 +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 \b 175 // OPENTTD_SPRITE_COUNT
-   -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 8bpp 248  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 264  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 280  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 296  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 312  440  14  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 328  440  14  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 348  440   8   8   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 362  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 388  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 414  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 440  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 466  440  20  20   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 490  440  20  20   0   0 normal
+   -1 * 3	 05 15 A2
+   -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/orig_extra.nfo
+++ b/media/extra_grf/orig_extra.nfo
@@ -1,87 +0,0 @@
-// Automatically generated by GRFCODEC. Do not modify!
-// (Info version 32)
-// Format: spritenum imagefile depth xpos ypos xsize ysize xrel yrel zoom flags
-//
-// $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/>.
-//
-// Sources for extra graphics to complement the original graphics.
-// Checks whether the correct version of OpenTTD is used before
-// allowing it to be used.
-//
-
-//
-// Number of sprites, it is wrong, but GRFcodec automagically gets it right.
-//
-    0 * 4	 00 00 00 00
-
-
-//
-// Check whether we are running OTTD or not.
-//
-   -1 * 0	 07 9D 04 \7= 01 00 00 00 01
-   -1 * 0	 0B 03 7F FF 80 " is not for TTDPatch. Use ttdpatch(w).grf." 00
-
-
-//
-// Check for OTTD's version number
-//
-
-// First step... Variable A1 might not exist. If that's the case it always
-// skips. As we do not want to skip out of the whole testing, we skip over
-// the real version check.
-   -1 * 0	 07 A1 04 \7= FF FF FF FF 02
-
-// Real version check.
-   -1 * 0	 07 A1 04 \7> \w20304 01 01 03
-
-// If the version check is supported, the string is translateable via OpenTTD
-// itself. Use it!.
-
-   -1 * 0	 0B 03 7F 06 "1.1 (or trunk r20304)" 00
-
-// Some OTTD versions before r11130 did support Action B, so use the English
-// phrase there
-   -1 * 0	 0B 03 7F FF "Requires OpenTTD version 1.1 (or trunk r20304) or better." 00
-
-// Final fallback. No Action B support, just skip to the end of the file.
-   -1 * 0	 07 A1 04 \7= FF FF FF FF 00
-
-// We are a DOS paletted NewGRF, so tell OpenTTD that. Then it can actually
-// do the right thing. Yay for that feature as that means no duplicate NewGRF!
-   -1 * 0	 14
-             "C" "INFO"
-                 "B" "PALS" \w1 "D"
-                 00
-             00
-
-// GRF ID, must start with FF so it gets ignored
-//@@WARNING DISABLE 101
-   -1 * 0	 08 08 FF "OTT"
-
-// Name of the GRF
-             "Original baseset extra graphics" 00
-
-// Description of the GRF.
-             "License: GNU General Public License version 2" 0D
-             "Andrew Parkhouse: rivers" 0D
-             "Addi and PaulC: original graphics fixes" 0D
-             "OpenTTD developers: other graphics" 00
-
-//
-// The real data of the GRF is acquired from several subfiles.
-//
-#include "chars_orig_extra.nfo"
-#include "shore.nfo"
-#include "fix_graphics.nfo"
-#include "airports_orig_extra.nfo"
-#include "canals_extra.nfo"
-#include "rivers/rapids.nfo"
-#include "rivers/temperate.nfo"
-#include "rivers/arctic.nfo"
-#include "rivers/tropic.nfo"
-#include "rivers/toyland.nfo"
--- a/media/extra_grf/palette.nfo
+++ b/media/extra_grf/palette.nfo
@@ -1,20 +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 * 0	 0C "All black palette"
-   -1 * 0 05 18 01
-   -1 * 0	 00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-	 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-	 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-	 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-	 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-	 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-	 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-	 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-	 01
--- 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 * 52	 0C "Missing shore tile graphics for the toyland climate"
+   -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/Show More
+++ b/Show More
Author	SHA1	Message	Date
rubidium	1c907e4596	(svn r23971) -Release: 1.2.0-RC1; tag you're it!	2012-02-19 20:08:27 +00:00
rubidium	8f8be22bc9	(svn r23970) [1.2] -Prepare: 1.2.0-RC1	2012-02-19 19:53:20 +00:00
rubidium	ebb7d2084b	(svn r23968) [1.2] -Branch: there we go...	2012-02-19 19:07:09 +00:00