From 9102febc37475af113681eaaee02ecc2ea04b4da Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Thu, 28 Jun 2007 15:25:39 +0000
Subject: Minor various fixes, Dialog validation started, GUI fixes, String
 methods added

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@21 6ecfd1a5-f3ed-3746-8530-beee90d26b22
---
 Changelog                            |  20 +-
 Hat.h                                |  13 +-
 Makefile                             | 151 ++++++++
 pokegen.cbp                          | 571 ++++++------------------------
 pokegen.depend                       | 655 ++++++++++++++++++++++++++++-------
 pokegen.layout                       |  38 +-
 pokemod/Badge.cpp                    |  18 +-
 pokemod/Badge.h                      |   4 +-
 pokemod/Dialog.cpp                   | 545 ++++++++++++++++++++++++++++-
 pokemod/Dialog.h                     |   5 +-
 pokemod/Ini.cpp                      | 165 +++++----
 pokemod/Ini.h                        |  19 +-
 pokemod/Path.cpp                     |   2 +-
 pokemod/Pokemod.cpp                  | 230 ++++--------
 pokemod/Pokemod.h                    |  49 ++-
 pokemod/Pokemon.cpp                  | 184 +++++-----
 pokemod/Pokemon.h                    |  14 +-
 pokemod/Ref.h                        |   8 +-
 pokemod/StatusEffect.h               |   1 -
 pokemod/String.cpp                   | 113 +++++-
 pokemod/String.h                     |  22 +-
 pokemod/TODO                         |  15 +-
 pokemod/pokemod_inc.h                |   2 +-
 pokemodr/gui/PokeModr.pjd            | 186 +++-------
 pokemodr/gui/dlgCheckLevels.cpp      | 166 ++++-----
 pokemodr/gui/dlgCheckLevels.h        |  40 +--
 pokemodr/gui/dlgCheckMoney.cpp       | 166 ++++-----
 pokemodr/gui/dlgCheckMoney.h         |  40 +--
 pokemodr/gui/dlgCheckRoster.cpp      | 166 ++++-----
 pokemodr/gui/dlgCheckRoster.h        |  40 +--
 pokemodr/gui/dlgCheckSpecies.cpp     | 161 ++++-----
 pokemodr/gui/dlgCheckSpecies.h       |  38 +-
 pokemodr/gui/dlgGiveBadge.cpp        | 219 ++++++++++++
 pokemodr/gui/dlgGiveBadge.h          | 112 ++++++
 pokemodr/gui/dlgYesNo.cpp            | 133 ++++---
 pokemodr/gui/dlgYesNo.h              |  32 +-
 pokemodr/gui/menuEntry.cpp           | 128 +++----
 pokemodr/gui/menuEntry.h             |  48 +--
 pokemodr/images/overlays/effect.png  | Bin 248 -> 340 bytes
 pokemodr/images/overlays/no-walk.png | Bin 167 -> 149 bytes
 pokemodr/images/overlays/trainer.png | Bin 203 -> 284 bytes
 pokemodr/images/overlays/walk.png    | Bin 200 -> 192 bytes
 pokemodr/images/overlays/warp.png    | Bin 232 -> 296 bytes
 pokemodr/images/overlays/water.png   | Bin 200 -> 192 bytes
 pokemodr/images/overlays/wilds.png   | Bin 200 -> 418 bytes
 45 files changed, 2785 insertions(+), 1734 deletions(-)
 create mode 100644 Makefile
 create mode 100644 pokemodr/gui/dlgGiveBadge.cpp
 create mode 100644 pokemodr/gui/dlgGiveBadge.h

diff --git a/Changelog b/Changelog
index 267d49fa..08b54b05 100644
--- a/Changelog
+++ b/Changelog
@@ -1,11 +1,27 @@
+-----------------
+Rev:  21
+Date: 28 June 2007
+User: MathStuf
+-----------------
+[FIX] Rev 20 date
+[FIX] Tile overlays in pokemodr to 64x64
+[ADD] Makefile for Linux
+[FIX] Various (un)signed mismatches (mainly with std::string::npos)
+[ADD] Count method to String
+[ADD] Convert methods to String
+[FIX] Ini GetValues to new abstraction in String
+[ADD] Skeleton for Dialog validation (19 more to go)
+[FIX] Some minor GUI things
+[FIX] Some optimizations for Hat.h
+
 -----------------
 Rev:  20
-Date: 17 June 2007
+Date: 22 June 2007
 User: MathStuf
 -----------------
 [ADD] Pokemod validation
 [FIX] made internal Pokemod pointer instead of global curPokeMod
-[ADD] MapEffect validation
+[ADD] MapEffect validation
 [FIX] Make images needed copy to necessary places
 
 -----------------
diff --git a/Hat.h b/Hat.h
index 03230480..38fee249 100644
--- a/Hat.h
+++ b/Hat.h
@@ -33,11 +33,10 @@ namespace PokeGen
    template<class T> class Hat
    {
       public:
-         Hat()
+         Hat() :
+               totalWeight(1)
          {
             std::srand(std::time(NULL));
-            objects.clear();
-            totalWeight = 1;
          }
          
          T PickItem()
@@ -68,17 +67,15 @@ namespace PokeGen
          }
          
          unsigned GetWeight(const T &key)
-         {
+         {
             if (objects.find(key) != objects.end())
                return objects[key];
             return 0;
          }
          
          unsigned operator[](const T &key)
-         {
-            if (objects.find(key) != objects.end())
-               return objects[key];
-            return 0;
+         {
+            return GetWeight(key);
          }
       private:
          std::map<T, unsigned> objects;
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..0bb183fd
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,151 @@
+objDir = ../obj
+binDir = ../bin
+
+pokemodDir = pokemod
+pokemodrDir = pokemodr
+
+options = -Wall -O3
+
+pokemodr : pokemod
+	g++ $(options) -o $(binDir)/pokemodr $(pokemodr)/PokeModr.cpp -lpokemod
+
+pokemod : Pokemod.o
+	ld -G $(objDir)/$(pokemodDir)/*.o -o $(binDir)/libpokemod.so
+
+Ability.o : $(pokemodDir)/Ability.h $(pokemodDir)/Ability.cpp Object.o AbilityEffect.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Ability.o $(pokemodDir)/Ability.cpp
+
+AbilityEffect.o : $(pokemodDir)/AbilityEffect.h $(pokemodDir)/AbilityEffect.cpp Object.o Pokemod.o Type.o String.o Frac.o Ref.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/AbilityEffect.o $(pokemodDir)/AbilityEffect.cpp
+
+Author.o : $(pokemodDir)/Author.h $(pokemodDir)/Author.cpp String.o Object.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Author.o $(pokemodDir)/Author.cpp
+
+Badge.o : $(pokemodDir)/Badge.h $(pokemodDir)/Badge.cpp Object.o Pokemod.o String.o Frac.o Ref.o Path.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Badge.o $(pokemodDir)/Badge.cpp
+
+CoinItem.o : $(pokemodDir)/CoinItem.h $(pokemodDir)/CoinItem.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/CoinItem.o $(pokemodDir)/CoinItem.cpp
+
+CoinList.o : $(pokemodDir)/CoinList.h $(pokemodDir)/CoinList.cpp Object.o Pokemod.o CoinItem.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/CoinList.o $(pokemodDir)/CoinList.cpp
+
+Debug.o : $(pokemodDir)/Debug.h $(pokemodDir)/Debug.cpp String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Debug.o $(pokemodDir)/Debug.cpp
+
+Dialog.o : $(pokemodDir)/Dialog.h $(pokemodDir)/Dialog.cpp Object.o Pokemod.o Path.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Dialog.o $(pokemodDir)/Dialog.cpp
+
+EggGroup.o : $(pokemodDir)/EggGroup.h $(pokemodDir)/EggGroup.cpp Object.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/EggGroup.o $(pokemodDir)/EggGroup.cpp
+
+Flag.o : $(pokemodDir)/Flag.h $(pokemodDir)/Flag.cpp Debug.o Ini.o Ref.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Flag.o $(pokemodDir)/Flag.cpp
+
+Frac.o : $(pokemodDir)/Frac.h $(pokemodDir)/Frac.cpp Debug.o Ini.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Frac.o $(pokemodDir)/Frac.cpp
+
+Ini.o : $(pokemodDir)/Ini.h $(pokemodDir)/Ini.cpp String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Ini.o $(pokemodDir)/Ini.cpp
+
+Item.o : $(pokemodDir)/Item.h $(pokemodDir)/Item.cpp Object.o Pokemod.o ItemEffect.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Item.o $(pokemodDir)/Item.cpp
+
+ItemEffect.o : $(pokemodDir)/ItemEffect.h $(pokemodDir)/ItemEffect.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/ItemEffect.o $(pokemodDir)/ItemEffect.cpp
+
+ItemStorage.o : $(pokemodDir)/ItemStorage.h $(pokemodDir)/ItemStorage.cpp Object.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/ItemStorage.o $(pokemodDir)/ItemStorage.cpp
+
+Map.o : $(pokemodDir)/Map.h $(pokemodDir)/Map.cpp Object.o MapEffect.o MapTrainer.o MapWarp.o MapWildList.o String.o Matrix.h
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Map.o $(pokemodDir)/Map.cpp
+
+MapEffect.o : $(pokemodDir)/MapEffect.h $(pokemodDir)/MapEffect.cpp Object.o Dialog.o Flag.o String.o Path.o Point.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/MapEffect.o $(pokemodDir)/MapEffect.cpp
+
+MapTrainer.o : $(pokemodDir)/MapTrainer.h $(pokemodDir)/MapTrainer.cpp Object.o Dialog.o MapTrainerTeam.o Flag.o String.o Path.o Point.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/MapTrainer.o $(pokemodDir)/MapTrainer.cpp
+
+MapTrainerTeam.o : $(pokemodDir)/MapTrainerTeam.h $(pokemodDir)/MapTrainerTeam.cpp Object.o Pokemod.oItem.o Pokemon.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/MapTrainerTeam.o $(pokemodDir)/MapTrainerTeam.cpp
+
+MapWarp.o : $(pokemodDir)/MapWarp.h $(pokemodDir)/MapWarp.cpp Object.o Dialog.o Map.o Flag.o String.o Point.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/MapWarp.o $(pokemodDir)/MapWarp.cpp
+
+MapWildList.o : $(pokemodDir)/MapWildList.h $(pokemodDir)/MapWildList.cpp Object.o Pokemod.o MapWildPokemon.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/MapWildList.o $(pokemodDir)/MapWildList.cpp
+
+MapWildPokemon.o : $(pokemodDir)/MapWildPokemon.h $(pokemodDir)/MapWildPokemon.cpp Object.o Pokemod.o Pokemon.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/MapWildPokemon.o $(pokemodDir)/MapWildPokemon.cpp
+
+Move.o : $(pokemodDir)/Move.h $(pokemodDir)/Move.cpp Object.o MoveEffect.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Move.o $(pokemodDir)/Move.cpp
+
+MoveEffect.o : $(pokemodDir)/MoveEffect.h $(pokemodDir)/MoveEffect.cpp Object.o Pokemod.o Frac.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/MoveEffect.o $(pokemodDir)/MoveEffect.cpp
+
+Nature.o : $(pokemodDir)/Nature.h $(pokemodDir)/Nature.cpp Object.o NatureEffect.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Nature.o $(pokemodDir)/Nature.cpp
+
+NatureEffect.o : $(pokemodDir)/NatureEffect.h $(pokemodDir)/NatureEffect.cpp Object.o Pokemod.o Frac.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/NatureEffect.o $(pokemodDir)/NatureEffect.cpp
+
+Object.o : $(pokemodDir)/Object.h $(pokemodDir)/Object.cpp Debug.o Ini.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Object.o $(pokemodDir)/Object.cpp
+
+Path.o : $(pokemodDir)/Path.h $(pokemodDir)/Path.cpp String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Path.o $(pokemodDir)/Path.cpp
+
+Point.o : $(pokemodDir)/Point.h $(pokemodDir)/Point.cpp Debug.o Ini.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Point.o $(pokemodDir)/Point.cpp
+
+Pokemod.o : $(pokemodDir)/Pokemod.h $(pokemodDir)/Pokemod.cpp $(pokemodDir)/pokemod_inc.h Object.o Ability.o Author.o Badge.o CoinList.o Dialog.o EggGroup.o Item.o OtemStorage.o Map.o Move.o Nature.o Pokemon.o Status.o Store.o Tile.o Time.o Type.o Frac.o Ini.o Path.o Point.o String.o Ref.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Pokemod.o $(pokemodDir)/Pokemod.cpp
+
+Pokemon.o : $(pokemodDir)/Pokemon.h $(pokemodDir)/Pokemon.cpp Object.o Pokemod.o PokemonAbility.o PokemonEvolution.o PokemonItem.o PokemonMove.o PokemonNature.o Frac.o Path.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Pokemon.o $(pokemodDir)/Pokemon.cpp
+
+PokemonAbility.o : $(pokemodDir)/PokemonAbility.h $(pokemodDir)/PokemonAbility.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/PokemonAbility.o $(pokemodDir)/PokemonAbility.cpp
+
+PokemonEvolution.o : $(pokemodDir)/PokemonEvolution.h $(pokemodDir)/PokemonEvolution.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/PokemonEvolution.o $(pokemodDir)/PokemonEvolution.cpp
+
+PokemonItem.o : $(pokemodDir)/PokemonItem.h $(pokemodDir)/PokemonItem.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/.o $(pokemodDir)/PokemonItem.cpp
+
+PokemonMove.o : $(pokemodDir)/PokemonMove.h $(pokemodDir)/PokemonMove.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/PokemonMove.o $(pokemodDir)/PokemonMove.cpp
+
+PokemonNature.o : $(pokemodDir)/PokemonNature.h $(pokemodDir)/PokemonNature.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/PokemonNature.o $(pokemodDir)/PokemonNature.cpp
+
+Ref.o : $(pokemodDir)/Ref.h $(pokemodDir)/Ref.cpp String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Ref.o $(pokemodDir)/Ref.cpp
+
+Status.o : $(pokemodDir)/Status.h $(pokemodDir)/Status.cpp Object.o Pokemod.o StatusEffect.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Status.o $(pokemodDir)/Status.cpp
+
+StatusEffect.o : $(pokemodDir)/StatusEffect.h $(pokemodDir)/StatusEffect.cpp Object.o Pokemod.o Ref.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/StatusEffect.o $(pokemodDir)/StatusEffect.cpp
+
+Store.o : $(pokemodDir)/Store.h $(pokemodDir)/Store.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Store.o $(pokemodDir)/Store.cpp
+
+String.o : $(pokemodDir)/String.h $(pokemodDir)/String.cpp
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/String.o $(pokemodDir)/String.cpp
+
+Tile.o : $(pokemodDir)/Tile.h $(pokemodDir)/Tile.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Tile.o $(pokemodDir)/Tile.cpp
+
+Time.o : $(pokemodDir)/Time.h $(pokemodDir)/Time.cpp Object.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Time.o $(pokemodDir)/Time.cpp
+
+Type.o : $(pokemodDir)/Type.h $(pokemodDir)/Type.cpp Object.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Type.o $(pokemodDir)/Type.cpp
+
+cleanpokemod :
+	rm -f $(objDir)/$(pokemodDir)/*.o
+
+cleanall : cleanpokemod
+	rm -f ../obj/*.o
diff --git a/pokegen.cbp b/pokegen.cbp
index d95f6333..a803915a 100644
--- a/pokegen.cbp
+++ b/pokegen.cbp
@@ -6,496 +6,149 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="pokemodr">
-				<Option platforms="Windows;" />
-				<Option output="..\bin\pokemodr.exe" prefix_auto="0" extension_auto="1" />
-				<Option object_output="..\obj\" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectCompilerOptionsRelation="0" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-Wall" />
-					<Add option="-pg" />
-					<Add option="-g" />
-				</Compiler>
-				<Linker>
-					<Add option="-pg -lgmon" />
-				</Linker>
-			</Target>
-			<Target title="pokegen">
-				<Option platforms="Windows;" />
-				<Option output="..\bin\pokegen.exe" prefix_auto="0" extension_auto="1" />
-				<Option object_output="..\obj\" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-Wall" />
-					<Add option="-pg" />
-					<Add option="-g" />
-				</Compiler>
-				<Linker>
-					<Add option="-pg -lgmon" />
-				</Linker>
-			</Target>
-			<Target title="audio">
-				<Option platforms="Windows;" />
-				<Option output="..\bin\audio.dll" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\bin" />
-				<Option object_output="..\obj\" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-			</Target>
-			<Target title="pokemod-DLL">
-				<Option platforms="Windows;" />
-				<Option output="..\lib\pokemod.dll" prefix_auto="1" extension_auto="1" />
-				<Option object_output="..\obj\" />
+			<Target title="pokemod">
+				<Option output="../bin/pokemodr.so" prefix_auto="0" extension_auto="1" />
+				<Option object_output="../obj/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-			</Target>
-			<Target title="Info">
-				<Option type="4" />
-				<Option compiler="gcc" />
 			</Target>
 		</Build>
 		<Compiler>
+			<Add option="-O3" />
 			<Add option="-Wall" />
-			<Add option="-pg" />
 			<Add option="-g" />
 		</Compiler>
 		<Linker>
 			<Add option="-pg -lgmon" />
 		</Linker>
 		<Unit filename="Changelog">
-			<Option target="Info" />
+			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
 		<Unit filename="Hat.h">
-			<Option target="pokegen" />
-		</Unit>
-		<Unit filename="STANDARDS">
-			<Option target="Info" />
-		</Unit>
-		<Unit filename="ai\Layer.cpp">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="ai\Layer.h">
+		<Unit filename="Makefile">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="ai\Net.cpp">
+		<Unit filename="STANDARDS">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="ai\Net.h">
+		<Unit filename="ai/Layer.cpp">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="ai\Node.cpp">
+		<Unit filename="ai/Layer.h">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="ai\Node.h">
+		<Unit filename="ai/Net.cpp">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="pokemod\Ability.cpp">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Ability.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\AbilityEffect.cpp">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\AbilityEffect.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Author.cpp">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Author.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Badge.cpp">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Badge.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\CoinItem.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\CoinItem.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\CoinList.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\CoinList.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Debug.cpp">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Debug.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Dialog.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Dialog.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\EggGroup.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\EggGroup.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Flag.cpp">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Flag.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Frac.cpp">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Frac.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Ini.cpp">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Ini.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Item.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Item.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\ItemEffect.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\ItemEffect.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\ItemStorage.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\ItemStorage.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Map.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Map.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\MapEffect.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\MapEffect.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\MapTrainer.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\MapTrainer.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\MapTrainerTeam.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\MapTrainerTeam.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\MapWarp.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\MapWarp.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\MapWildList.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\MapWildList.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\MapWildPokemon.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\MapWildPokemon.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Matrix.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Move.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Move.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\MoveEffect.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\MoveEffect.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Nature.cpp">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Nature.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\NatureEffect.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\NatureEffect.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Object.cpp">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Object.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Path.cpp">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Path.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Point.cpp">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Point.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Pokemod.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Pokemod.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Pokemon.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Pokemon.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\PokemonAbility.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\PokemonAbility.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\PokemonEvolution.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\PokemonEvolution.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\PokemonItem.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\PokemonItem.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\PokemonMove.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\PokemonMove.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\PokemonNature.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\PokemonNature.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Ref.cpp">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Ref.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Status.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Status.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\StatusEffect.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\StatusEffect.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Store.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Store.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\String.cpp">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\String.h">
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\TODO">
-			<Option target="Info" />
-		</Unit>
-		<Unit filename="pokemod\Tile.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Tile.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Time.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
-		</Unit>
-		<Unit filename="pokemod\Time.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
+		<Unit filename="ai/Net.h">
+			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="pokemod\Type.cpp">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
+		<Unit filename="ai/Node.cpp">
+			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="pokemod\Type.h">
-			<Option target="pokemodr" />
-			<Option target="pokegen" />
-			<Option target="pokemod-DLL" />
+		<Unit filename="ai/Node.h">
+			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="pokemod\pokemod_inc.h">
-			<Option target="pokemodr" />
+		<Unit filename="pokemod/Ability.cpp" />
+		<Unit filename="pokemod/Ability.h" />
+		<Unit filename="pokemod/AbilityEffect.cpp" />
+		<Unit filename="pokemod/AbilityEffect.h" />
+		<Unit filename="pokemod/Author.cpp" />
+		<Unit filename="pokemod/Author.h" />
+		<Unit filename="pokemod/Badge.cpp" />
+		<Unit filename="pokemod/Badge.h" />
+		<Unit filename="pokemod/CoinItem.cpp" />
+		<Unit filename="pokemod/CoinItem.h" />
+		<Unit filename="pokemod/CoinList.cpp" />
+		<Unit filename="pokemod/CoinList.h" />
+		<Unit filename="pokemod/Debug.cpp" />
+		<Unit filename="pokemod/Debug.h" />
+		<Unit filename="pokemod/Dialog.cpp" />
+		<Unit filename="pokemod/Dialog.h" />
+		<Unit filename="pokemod/EggGroup.cpp" />
+		<Unit filename="pokemod/EggGroup.h" />
+		<Unit filename="pokemod/Flag.cpp" />
+		<Unit filename="pokemod/Flag.h" />
+		<Unit filename="pokemod/Frac.cpp" />
+		<Unit filename="pokemod/Frac.h" />
+		<Unit filename="pokemod/Ini.cpp" />
+		<Unit filename="pokemod/Ini.h" />
+		<Unit filename="pokemod/Item.cpp" />
+		<Unit filename="pokemod/Item.h" />
+		<Unit filename="pokemod/ItemEffect.cpp" />
+		<Unit filename="pokemod/ItemEffect.h" />
+		<Unit filename="pokemod/ItemStorage.cpp" />
+		<Unit filename="pokemod/ItemStorage.h" />
+		<Unit filename="pokemod/Map.cpp" />
+		<Unit filename="pokemod/Map.h" />
+		<Unit filename="pokemod/MapEffect.cpp" />
+		<Unit filename="pokemod/MapEffect.h" />
+		<Unit filename="pokemod/MapTrainer.cpp" />
+		<Unit filename="pokemod/MapTrainer.h" />
+		<Unit filename="pokemod/MapTrainerTeam.cpp" />
+		<Unit filename="pokemod/MapTrainerTeam.h" />
+		<Unit filename="pokemod/MapWarp.cpp" />
+		<Unit filename="pokemod/MapWarp.h" />
+		<Unit filename="pokemod/MapWildList.cpp" />
+		<Unit filename="pokemod/MapWildList.h" />
+		<Unit filename="pokemod/MapWildPokemon.cpp" />
+		<Unit filename="pokemod/MapWildPokemon.h" />
+		<Unit filename="pokemod/Matrix.h" />
+		<Unit filename="pokemod/Move.cpp" />
+		<Unit filename="pokemod/Move.h" />
+		<Unit filename="pokemod/MoveEffect.cpp" />
+		<Unit filename="pokemod/MoveEffect.h" />
+		<Unit filename="pokemod/Nature.cpp" />
+		<Unit filename="pokemod/Nature.h" />
+		<Unit filename="pokemod/NatureEffect.cpp" />
+		<Unit filename="pokemod/NatureEffect.h" />
+		<Unit filename="pokemod/Object.cpp" />
+		<Unit filename="pokemod/Object.h" />
+		<Unit filename="pokemod/Path.cpp" />
+		<Unit filename="pokemod/Path.h" />
+		<Unit filename="pokemod/Point.cpp" />
+		<Unit filename="pokemod/Point.h" />
+		<Unit filename="pokemod/Pokemod.cpp" />
+		<Unit filename="pokemod/Pokemod.h" />
+		<Unit filename="pokemod/Pokemon.cpp" />
+		<Unit filename="pokemod/Pokemon.h" />
+		<Unit filename="pokemod/PokemonAbility.cpp" />
+		<Unit filename="pokemod/PokemonAbility.h" />
+		<Unit filename="pokemod/PokemonEvolution.cpp" />
+		<Unit filename="pokemod/PokemonEvolution.h" />
+		<Unit filename="pokemod/PokemonItem.cpp" />
+		<Unit filename="pokemod/PokemonItem.h" />
+		<Unit filename="pokemod/PokemonMove.cpp" />
+		<Unit filename="pokemod/PokemonMove.h" />
+		<Unit filename="pokemod/PokemonNature.cpp" />
+		<Unit filename="pokemod/PokemonNature.h" />
+		<Unit filename="pokemod/Ref.cpp" />
+		<Unit filename="pokemod/Ref.h" />
+		<Unit filename="pokemod/Status.cpp" />
+		<Unit filename="pokemod/Status.h" />
+		<Unit filename="pokemod/StatusEffect.cpp" />
+		<Unit filename="pokemod/StatusEffect.h" />
+		<Unit filename="pokemod/Store.cpp" />
+		<Unit filename="pokemod/Store.h" />
+		<Unit filename="pokemod/String.cpp" />
+		<Unit filename="pokemod/String.h" />
+		<Unit filename="pokemod/TODO">
+			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="pokemodr\PokeModr.cpp">
-			<Option target="pokemodr" />
+		<Unit filename="pokemod/Tile.cpp" />
+		<Unit filename="pokemod/Tile.h" />
+		<Unit filename="pokemod/Time.cpp" />
+		<Unit filename="pokemod/Time.h" />
+		<Unit filename="pokemod/Type.cpp" />
+		<Unit filename="pokemod/Type.h" />
+		<Unit filename="pokemod/pokemod_inc.h" />
+		<Unit filename="pokemodr/PokeModr.cpp">
+			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="pokemodr\PokeModrDebug.h">
-			<Option target="pokemodr" />
+		<Unit filename="pokemodr/PokeModrDebug.h">
+			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
 		<Extensions>
 			<code_completion />
diff --git a/pokegen.depend b/pokegen.depend
index d6b98955..9a697f7b 100644
--- a/pokegen.depend
+++ b/pokegen.depend
@@ -1,104 +1,108 @@
-# depslib dependency file v1.0
+# depslib dependency file v1.0
 1180843850 source:h:\ben\programming\pc\pokegen\src\pokemod\flag.cpp
 	"Flag.h"
-
+
+1180801004 
+
 1180848044 h:\ben\programming\pc\pokegen\src\pokemod\flag.h
 	"Debug.h"
 	"Ini.h"
 	"Ref.h"
-
+
 1180848064 h:\ben\programming\pc\pokegen\src\pokemod\debug.h
 	<ctime>
 	<fstream>
 	<cstdio>
 	"String.h"
-
+
 1180717448 h:\ben\programming\pc\pokegen\src\pokemod\string.h
 	<cstdarg>
 	<string>
 	<sstream>
 	<iostream>
-
+
 1180848048 h:\ben\programming\pc\pokegen\src\pokemod\frac.h
 	"Debug.h"
 	"Ini.h"
-
+
 1180899300 h:\ben\programming\pc\pokegen\src\pokemod\ini.h
 	<map>
 	<fstream>
 	"String.h"
-
+
 1182101840 h:\ben\programming\pc\pokegen\src\pokemod\ref.h
 	<vector>
 	"String.h"
-
+
 1180847176 source:h:\ben\programming\pc\pokegen\src\pokemod\ini.cpp
 	"Ini.h"
-
+
 1180847420 source:h:\ben\programming\pc\pokegen\src\pokemod\object.cpp
 	"Object.h"
-
+
 1180980116 h:\ben\programming\pc\pokegen\src\pokemod\object.h
 	<wx/listbox.h>
 	<fstream>
 	"Debug.h"
 	"Ini.h"
-
+
 1180847452 source:h:\ben\programming\pc\pokegen\src\pokemod\path.cpp
 	"Path.h"
-
+
 1180847932 h:\ben\programming\pc\pokegen\src\pokemod\path.h
 	<string>
 	<fstream>
 	"String.h"
-
+
 1180847462 source:h:\ben\programming\pc\pokegen\src\pokemod\point.cpp
 	"Point.h"
-
+
 1180901382 h:\ben\programming\pc\pokegen\src\pokemod\point.h
 	"Debug.h"
 	"Ini.h"
-
+
 1180847696 source:h:\ben\programming\pc\pokegen\src\pokemod\string.cpp
 	"String.h"
-
+
 1180843688 source:h:\ben\programming\pc\pokegen\src\pokemod\debug.cpp
 	"Debug.h"
-
+
 1180889888 source:h:\ben\programming\pc\pokegen\src\pokemod\ref.cpp
 	"Ref.h"
-
+
 1180847608 source:h:\ben\programming\pc\pokegen\src\pokemod\type.cpp
 	"Type.h"
-
+
 1180184954 h:\ben\programming\pc\pokegen\src\pokemod\type.h
 	"Object.h"
 	"String.h"
-
+
 1180847616 source:h:\ben\programming\pc\pokegen\src\pokemod\time.cpp
 	"Time.h"
-
+
 1180184978 h:\ben\programming\pc\pokegen\src\pokemod\time.h
 	"Object.h"
 	"String.h"
-
+
 1180843820 source:h:\ben\programming\pc\pokegen\src\pokemod\egggroup.cpp
 	"EggGroup.h"
-
+
+1180980336 h"
+
 1180848052 h:\ben\programming\pc\pokegen\src\pokemod\egggroup.h
 	"Object.h"
 	"String.h"
-
+
 1180843074 source:h:\ben\programming\pc\pokegen\src\pokemod\author.cpp
 	"Author.h"
-
+
 1180848088 h:\ben\programming\pc\pokegen\src\pokemod\author.h
 	"Object.h"
 	"String.h"
-
+
 1180843064 source:h:\ben\programming\pc\pokegen\src\pokemod\badge.cpp
 	"Badge.h"
-
+
 1180966996 h:\ben\programming\pc\pokegen\src\pokemod\badge.h
 	"Object.h"
 	"String.h"
@@ -106,7 +110,9 @@
 	"Path.h"
 	"Frac.h"
 	"Pokemod.h"
-
+
+1180981206 "
+
 1180981772 h:\ben\programming\pc\pokegen\src\pokemod\pokemod.h
 	<vector>
 	<map>
@@ -135,16 +141,18 @@
 	"Tile.h"
 	"Time.h"
 	"Type.h"
-
+
 1180848102 h:\ben\programming\pc\pokegen\src\pokemod\pokemod_inc.h
 	"Pokemod.h"
-
+
 1180980186 h:\ben\programming\pc\pokegen\src\pokemod\ability.h
 	<vector>
 	"Object.h"
 	"String.h"
 	"AbilityEffect.h"
-
+
+1180801281 fect.h"
+
 1180966976 h:\ben\programming\pc\pokegen\src\pokemod\abilityeffect.h
 	"Object.h"
 	"String.h"
@@ -153,7 +161,7 @@
 	"Frac.h"
 	"Type.h"
 	"Ref.h"
-
+
 1180967010 h:\ben\programming\pc\pokegen\src\pokemod\coinlist.h
 	<vector>
 	<map>
@@ -161,12 +169,12 @@
 	"String.h"
 	"Pokemod.h"
 	"CoinItem.h"
-
+
 1180967002 h:\ben\programming\pc\pokegen\src\pokemod\coinitem.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180967034 h:\ben\programming\pc\pokegen\src\pokemod\item.h
 	<vector>
 	<map>
@@ -174,103 +182,117 @@
 	"String.h"
 	"Pokemod.h"
 	"ItemEffect.h"
-
+
+1180980726 t.h"
+
 1180967040 h:\ben\programming\pc\pokegen\src\pokemod\itemeffect.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180848028 h:\ben\programming\pc\pokegen\src\pokemod\itemstorage.h
 	"Object.h"
 	"String.h"
-
+
 1180980782 h:\ben\programming\pc\pokegen\src\pokemod\nature.h
 	<vector>
 	"Object.h"
 	"String.h"
 	"NatureEffect.h"
-
+
+1180981258 ect.h"
+
 1180967194 h:\ben\programming\pc\pokegen\src\pokemod\natureeffect.h
 	"Object.h"
 	"String.h"
 	"Frac.h"
 	"Pokemod.h"
-
+
 1180980726 h:\ben\programming\pc\pokegen\src\pokemod\move.h
 	<vector>
 	<map>
 	"Object.h"
 	"String.h"
 	"MoveEffect.h"
-
+
 1180847958 h:\ben\programming\pc\pokegen\src\pokemod\moveeffect.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
 	"Frac.h"
-
+
 1180967644 h:\ben\programming\pc\pokegen\src\pokemod\store.h
 	<vector>
 	<map>
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180744584 source:h:\ben\programming\pc\pokegen\src\pokemod\dialog.cpp
 	"Dialog.h"
-
+
 1180967018 h:\ben\programming\pc\pokegen\src\pokemod\dialog.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180843936 source:h:\ben\programming\pc\pokegen\src\pokemod\frac.cpp
 	"Frac.h"
-
+
 1180844756 source:h:\ben\programming\pc\pokegen\src\pokemod\itemstorage.cpp
 	"ItemStorage.h"
-
+
+1180844756 ge.h"
+
 1180744584 source:h:\ben\programming\pc\pokegen\src\pokemod\natureeffect.cpp
 	"NatureEffect.h"
-
+
 1180744584 source:h:\ben\programming\pc\pokegen\src\pokemod\pokemonability.cpp
 	"PokemonAbility.h"
-
+
+1180744584 ility.h"
+
 1180967266 h:\ben\programming\pc\pokegen\src\pokemod\pokemonability.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180744586 source:h:\ben\programming\pc\pokegen\src\pokemod\pokemonitem.cpp
 	"PokemonItem.h"
-
+
+1180744586 em.h"
+
 1180967574 h:\ben\programming\pc\pokegen\src\pokemod\pokemonitem.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180744586 source:h:\ben\programming\pc\pokegen\src\pokemod\pokemonmove.cpp
 	"PokemonMove.h"
-
+
+1180744586 ve.h"
+
 1180981336 h:\ben\programming\pc\pokegen\src\pokemod\pokemonmove.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180744586 source:h:\ben\programming\pc\pokegen\src\pokemod\pokemonnature.cpp
 	"PokemonNature.h"
-
+
+1180967238 ture.h"
+
 1180981302 h:\ben\programming\pc\pokegen\src\pokemod\pokemonnature.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180744586 source:h:\ben\programming\pc\pokegen\src\pokemod\store.cpp
 	"Store.h"
-
+
 1180717534 source:f:\pokegen\src\pokemod\pokemon.cpp
 	"Pokemon.h"
-
+
 1180967238 f:\pokegen\src\pokemod\pokemon.h
 	<vector>
 	<map>
@@ -284,39 +306,39 @@
 	"PokemonItem.h"
 	"PokemonMove.h"
 	"PokemonNature.h"
-
+
 1180980116 f:\pokegen\src\pokemod\object.h
 	<wx/listbox.h>
 	<fstream>
 	"Debug.h"
 	"Ini.h"
-
+
 1180848064 f:\pokegen\src\pokemod\debug.h
 	<ctime>
 	<fstream>
 	<cstdio>
 	"String.h"
-
+
 1180717448 f:\pokegen\src\pokemod\string.h
 	<cstdarg>
 	<string>
 	<sstream>
 	<iostream>
-
+
 1180899300 f:\pokegen\src\pokemod\ini.h
 	<map>
 	<fstream>
 	"String.h"
-
+
 1180848048 f:\pokegen\src\pokemod\frac.h
 	"Debug.h"
 	"Ini.h"
-
+
 1180847932 f:\pokegen\src\pokemod\path.h
 	<string>
 	<fstream>
 	"String.h"
-
+
 1180981350 f:\pokegen\src\pokemod\pokemod.h
 	<vector>
 	<map>
@@ -345,20 +367,20 @@
 	"Tile.h"
 	"Time.h"
 	"Type.h"
-
+
 1180848102 f:\pokegen\src\pokemod\pokemod_inc.h
 	"Pokemod.h"
-
+
 1180890016 f:\pokegen\src\pokemod\ref.h
 	<vector>
 	"String.h"
-
+
 1180980186 f:\pokegen\src\pokemod\ability.h
 	<vector>
 	"Object.h"
 	"String.h"
 	"AbilityEffect.h"
-
+
 1180966976 f:\pokegen\src\pokemod\abilityeffect.h
 	"Object.h"
 	"String.h"
@@ -367,15 +389,15 @@
 	"Frac.h"
 	"Type.h"
 	"Ref.h"
-
+
 1180184954 f:\pokegen\src\pokemod\type.h
 	"Object.h"
 	"String.h"
-
+
 1180848088 f:\pokegen\src\pokemod\author.h
 	"Object.h"
 	"String.h"
-
+
 1180966996 f:\pokegen\src\pokemod\badge.h
 	"Object.h"
 	"String.h"
@@ -383,7 +405,7 @@
 	"Path.h"
 	"Frac.h"
 	"Pokemod.h"
-
+
 1180967010 f:\pokegen\src\pokemod\coinlist.h
 	<vector>
 	<map>
@@ -391,21 +413,21 @@
 	"String.h"
 	"Pokemod.h"
 	"CoinItem.h"
-
+
 1180967002 f:\pokegen\src\pokemod\coinitem.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180967018 f:\pokegen\src\pokemod\dialog.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180848052 f:\pokegen\src\pokemod\egggroup.h
 	"Object.h"
 	"String.h"
-
+
 1180967034 f:\pokegen\src\pokemod\item.h
 	<vector>
 	<map>
@@ -413,80 +435,80 @@
 	"String.h"
 	"Pokemod.h"
 	"ItemEffect.h"
-
+
 1180967040 f:\pokegen\src\pokemod\itemeffect.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180848028 f:\pokegen\src\pokemod\itemstorage.h
 	"Object.h"
 	"String.h"
-
+
 1180980726 f:\pokegen\src\pokemod\move.h
 	<vector>
 	<map>
 	"Object.h"
 	"String.h"
 	"MoveEffect.h"
-
+
 1180847958 f:\pokegen\src\pokemod\moveeffect.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
 	"Frac.h"
-
+
 1180980782 f:\pokegen\src\pokemod\nature.h
 	<vector>
 	"Object.h"
 	"String.h"
 	"NatureEffect.h"
-
+
 1180967194 f:\pokegen\src\pokemod\natureeffect.h
 	"Object.h"
 	"String.h"
 	"Frac.h"
 	"Pokemod.h"
-
+
 1180967644 f:\pokegen\src\pokemod\store.h
 	<vector>
 	<map>
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180184978 f:\pokegen\src\pokemod\time.h
 	"Object.h"
 	"String.h"
-
+
 1180967266 f:\pokegen\src\pokemod\pokemonability.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180967542 f:\pokegen\src\pokemod\pokemonevolution.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180967574 f:\pokegen\src\pokemod\pokemonitem.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180981336 f:\pokegen\src\pokemod\pokemonmove.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180981302 f:\pokegen\src\pokemod\pokemonnature.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180844557 source:h:\ben\programming\pc\pokegen\src\pokemod\ability.cpp
 	"Ability.h"
-
+
 1180967050 h:\ben\programming\pc\pokegen\src\pokemod\map.h
 	<vector>
 	<map>
@@ -497,13 +519,15 @@
 	"MapTrainer.h"
 	"MapWarp.h"
 	"MapWildList.h"
-
+
+1180967050 st.h"
+
 1180914776 h:\ben\programming\pc\pokegen\src\pokemod\matrix.h
 	<vector>
 	"Point.h"
 	"Frac.h"
 	"Ini.h"
-
+
 1182102201 h:\ben\programming\pc\pokegen\src\pokemod\mapeffect.h
 	"Object.h"
 	"String.h"
@@ -511,7 +535,7 @@
 	"Point.h"
 	"Path.h"
 	"Dialog.h"
-
+
 1180967066 h:\ben\programming\pc\pokegen\src\pokemod\maptrainer.h
 	<vector>
 	<map>
@@ -522,14 +546,16 @@
 	"Path.h"
 	"Dialog.h"
 	"MapTrainerTeam.h"
-
+
+1180967066 rTeam.h"
+
 1180967072 h:\ben\programming\pc\pokegen\src\pokemod\maptrainerteam.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
 	"Pokemon.h"
 	"Item.h"
-
+
 1180967238 h:\ben\programming\pc\pokegen\src\pokemod\pokemon.h
 	<vector>
 	<map>
@@ -543,12 +569,12 @@
 	"PokemonItem.h"
 	"PokemonMove.h"
 	"PokemonNature.h"
-
+
 1180967542 h:\ben\programming\pc\pokegen\src\pokemod\pokemonevolution.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180967080 h:\ben\programming\pc\pokegen\src\pokemod\mapwarp.h
 	"Object.h"
 	"String.h"
@@ -556,20 +582,22 @@
 	"Point.h"
 	"Map.h"
 	"Dialog.h"
-
+
 1180966964 h:\ben\programming\pc\pokegen\src\pokemod\mapwildlist.h
 	<vector>
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
 	"MapWildPokemon.h"
-
+
+1180966964 kemon.h"
+
 1180980678 h:\ben\programming\pc\pokegen\src\pokemod\mapwildpokemon.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
 	"Pokemon.h"
-
+
 1180981258 h:\ben\programming\pc\pokegen\src\pokemod\status.h
 	<vector>
 	<map>
@@ -577,64 +605,66 @@
 	"String.h"
 	"Pokemod.h"
 	"StatusEffect.h"
-
+
 1180981206 h:\ben\programming\pc\pokegen\src\pokemod\tile.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
 1180801004 h:\ben\programming\pc\pokegen\src\pokemod\statuseffect.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
 	"Status.h"
 	"Ref.h"
-
+
 1180801281 source:h:\ben\programming\pc\pokegen\src\pokemod\abilityeffect.cpp
 	"AbilityEffect.h"
-
+
 1180980310 source:h:\ben\programming\pc\pokegen\src\pokemod\coinitem.cpp
 	"CoinItem.h"
-
+
 1180980336 source:h:\ben\programming\pc\pokegen\src\pokemod\coinlist.cpp
 	"CoinList.h"
-
+
 1180844604 source:h:\ben\programming\pc\pokegen\src\pokemod\item.cpp
 	"Item.h"
-
+
 1180744584 source:h:\ben\programming\pc\pokegen\src\pokemod\maptrainerteam.cpp
 	"MapTrainerTeam.h"
-
+
 1180918072 source:h:\ben\programming\pc\pokegen\src\pokemod\mapwildlist.cpp
 	"MapWildList.h"
-
+
 1180744584 source:h:\ben\programming\pc\pokegen\src\pokemod\mapwildpokemon.cpp
 	"MapWildPokemon.h"
-
+
 1180890178 source:h:\ben\programming\pc\pokegen\src\pokemod\nature.cpp
 	"Nature.h"
-
+
 1180916341 source:h:\ben\programming\pc\pokegen\src\pokemod\pokemod.cpp
 	"Pokemod.h"
-
+
 1180886988 source:h:\ben\programming\pc\pokegen\src\pokemod\pokemon.cpp
 	"Pokemon.h"
-
+
 1180744586 source:h:\ben\programming\pc\pokegen\src\pokemod\pokemonevolution.cpp
 	"PokemonEvolution.h"
-
+
+1180744586 olution.h"
+
 1180890334 source:h:\ben\programming\pc\pokegen\src\pokemod\status.cpp
 	"Status.h"
-
+
 1180847656 source:h:\ben\programming\pc\pokegen\src\pokemod\tile.cpp
 	"Tile.h"
-
+
 1182100473 source:h:\ben\programming\pc\pokegen\src\pokemod\map.cpp
 	"Map.h"
-
+
 1180980900 source:f:\pokegen\src\pokemod\pokemod.cpp
 	"Pokemod.h"
-
+
 1180967050 f:\pokegen\src\pokemod\map.h
 	<vector>
 	<map>
@@ -645,17 +675,17 @@
 	"MapTrainer.h"
 	"MapWarp.h"
 	"MapWildList.h"
-
+
 1180914776 f:\pokegen\src\pokemod\matrix.h
 	<vector>
 	"Point.h"
 	"Frac.h"
 	"Ini.h"
-
+
 1180901382 f:\pokegen\src\pokemod\point.h
 	"Debug.h"
 	"Ini.h"
-
+
 1180967056 f:\pokegen\src\pokemod\mapeffect.h
 	"Object.h"
 	"String.h"
@@ -663,12 +693,12 @@
 	"Point.h"
 	"Path.h"
 	"Dialog.h"
-
+
 1180848044 f:\pokegen\src\pokemod\flag.h
 	"Debug.h"
 	"Ini.h"
 	"Ref.h"
-
+
 1180967066 f:\pokegen\src\pokemod\maptrainer.h
 	<vector>
 	<map>
@@ -679,14 +709,14 @@
 	"Path.h"
 	"Dialog.h"
 	"MapTrainerTeam.h"
-
+
 1180967072 f:\pokegen\src\pokemod\maptrainerteam.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
 	"Pokemon.h"
 	"Item.h"
-
+
 1180967080 f:\pokegen\src\pokemod\mapwarp.h
 	"Object.h"
 	"String.h"
@@ -694,20 +724,20 @@
 	"Point.h"
 	"Map.h"
 	"Dialog.h"
-
+
 1180966964 f:\pokegen\src\pokemod\mapwildlist.h
 	<vector>
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
 	"MapWildPokemon.h"
-
+
 1180980678 f:\pokegen\src\pokemod\mapwildpokemon.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
 	"Pokemon.h"
-
+
 1180981258 f:\pokegen\src\pokemod\status.h
 	<vector>
 	<map>
@@ -715,16 +745,377 @@
 	"String.h"
 	"Pokemod.h"
 	"StatusEffect.h"
-
+
 1180801004 f:\pokegen\src\pokemod\statuseffect.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
 	"Status.h"
 	"Ref.h"
-
+
 1180981206 f:\pokegen\src\pokemod\tile.h
 	"Object.h"
 	"String.h"
 	"Pokemod.h"
-
+
+1180980242 source:/home/Ben/pokegen/src/pokemod/Ability.cpp
+	"Ability.h"
+
+1180980186 /home/Ben/pokegen/src/pokemod/Ability.h
+	<vector>
+	"Object.h"
+	"String.h"
+	"AbilityEffect.h"
+
+1180980116 /home/Ben/pokegen/src/pokemod/Object.h
+	<wx/listbox.h>
+	<fstream>
+	"Debug.h"
+	"Ini.h"
+
+1180848064 /home/Ben/pokegen/src/pokemod/Debug.h
+	<ctime>
+	<fstream>
+	<cstdio>
+	"String.h"
+
+1182979880 /home/Ben/pokegen/src/pokemod/String.h
+	<cstdarg>
+	<string>
+	<sstream>
+	<iostream>
+
+1182979768 /home/Ben/pokegen/src/pokemod/Ini.h
+	<map>
+	<fstream>
+	"String.h"
+
+1180966976 /home/Ben/pokegen/src/pokemod/AbilityEffect.h
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+	"Ability.h"
+	"Frac.h"
+	"Type.h"
+	"Ref.h"
+
+1182557040 /home/Ben/pokegen/src/pokemod/Pokemod.h
+	<vector>
+	<map>
+	<sstream>
+	<string>
+	"pokemod_inc.h"
+	"Object.h"
+	"Frac.h"
+	"Ini.h"
+	"Path.h"
+	"Point.h"
+	"Ref.h"
+	"String.h"
+	"Ability.h"
+	"Author.h"
+	"Badge.h"
+	"CoinList.h"
+	"Dialog.h"
+	"EggGroup.h"
+	"Item.h"
+	"ItemStorage.h"
+	"Map.h"
+	"Move.h"
+	"Nature.h"
+	"Pokemon.h"
+	"Status.h"
+	"Store.h"
+	"Tile.h"
+	"Time.h"
+	"Type.h"
+
+1182557055 /home/Ben/pokegen/src/pokemod/pokemod_inc.h
+	"Pokemod.h"
+
+1180848048 /home/Ben/pokegen/src/pokemod/Frac.h
+	"Debug.h"
+	"Ini.h"
+
+1180847932 /home/Ben/pokegen/src/pokemod/Path.h
+	<string>
+	<fstream>
+	"String.h"
+
+1180901382 /home/Ben/pokegen/src/pokemod/Point.h
+	"Debug.h"
+	"Ini.h"
+
+1182973422 /home/Ben/pokegen/src/pokemod/Ref.h
+	<vector>
+	"String.h"
+
+1180848088 /home/Ben/pokegen/src/pokemod/Author.h
+	"Object.h"
+	"String.h"
+
+1182546092 /home/Ben/pokegen/src/pokemod/Badge.h
+	"Object.h"
+	"String.h"
+	"Ref.h"
+	"Path.h"
+	"Frac.h"
+	"Pokemod.h"
+
+1180967010 /home/Ben/pokegen/src/pokemod/CoinList.h
+	<vector>
+	<map>
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+	"CoinItem.h"
+
+1180967002 /home/Ben/pokegen/src/pokemod/CoinItem.h
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+
+1182973068 /home/Ben/pokegen/src/pokemod/Dialog.h
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+
+1180848052 /home/Ben/pokegen/src/pokemod/EggGroup.h
+	"Object.h"
+	"String.h"
+
+1180967034 /home/Ben/pokegen/src/pokemod/Item.h
+	<vector>
+	<map>
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+	"ItemEffect.h"
+
+1180967040 /home/Ben/pokegen/src/pokemod/ItemEffect.h
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+
+1180848028 /home/Ben/pokegen/src/pokemod/ItemStorage.h
+	"Object.h"
+	"String.h"
+
+1180967050 /home/Ben/pokegen/src/pokemod/Map.h
+	<vector>
+	<map>
+	"Object.h"
+	"String.h"
+	"Matrix.h"
+	"MapEffect.h"
+	"MapTrainer.h"
+	"MapWarp.h"
+	"MapWildList.h"
+
+1180914776 /home/Ben/pokegen/src/pokemod/Matrix.h
+	<vector>
+	"Point.h"
+	"Frac.h"
+	"Ini.h"
+
+1182102201 /home/Ben/pokegen/src/pokemod/MapEffect.h
+	"Object.h"
+	"String.h"
+	"Flag.h"
+	"Point.h"
+	"Path.h"
+	"Dialog.h"
+
+1180848044 /home/Ben/pokegen/src/pokemod/Flag.h
+	"Debug.h"
+	"Ini.h"
+	"Ref.h"
+
+1180967066 /home/Ben/pokegen/src/pokemod/MapTrainer.h
+	<vector>
+	<map>
+	"Object.h"
+	"String.h"
+	"Flag.h"
+	"Point.h"
+	"Path.h"
+	"Dialog.h"
+	"MapTrainerTeam.h"
+
+1180967072 /home/Ben/pokegen/src/pokemod/MapTrainerTeam.h
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+	"Pokemon.h"
+	"Item.h"
+
+1182546124 /home/Ben/pokegen/src/pokemod/Pokemon.h
+	<vector>
+	<map>
+	"Object.h"
+	"String.h"
+	"Frac.h"
+	"Path.h"
+	"Pokemod.h"
+	"PokemonAbility.h"
+	"PokemonEvolution.h"
+	"PokemonItem.h"
+	"PokemonMove.h"
+	"PokemonNature.h"
+
+1180967266 /home/Ben/pokegen/src/pokemod/PokemonAbility.h
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+
+1180967542 /home/Ben/pokegen/src/pokemod/PokemonEvolution.h
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+
+1180967574 /home/Ben/pokegen/src/pokemod/PokemonItem.h
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+
+1180981336 /home/Ben/pokegen/src/pokemod/PokemonMove.h
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+
+1180981302 /home/Ben/pokegen/src/pokemod/PokemonNature.h
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+
+1180967080 /home/Ben/pokegen/src/pokemod/MapWarp.h
+	"Object.h"
+	"String.h"
+	"Flag.h"
+	"Point.h"
+	"Map.h"
+	"Dialog.h"
+
+1180966964 /home/Ben/pokegen/src/pokemod/MapWildList.h
+	<vector>
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+	"MapWildPokemon.h"
+
+1180980678 /home/Ben/pokegen/src/pokemod/MapWildPokemon.h
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+	"Pokemon.h"
+
+1180980726 /home/Ben/pokegen/src/pokemod/Move.h
+	<vector>
+	<map>
+	"Object.h"
+	"String.h"
+	"MoveEffect.h"
+
+1180847958 /home/Ben/pokegen/src/pokemod/MoveEffect.h
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+	"Frac.h"
+
+1180980782 /home/Ben/pokegen/src/pokemod/Nature.h
+	<vector>
+	"Object.h"
+	"String.h"
+	"NatureEffect.h"
+
+1180967194 /home/Ben/pokegen/src/pokemod/NatureEffect.h
+	"Object.h"
+	"String.h"
+	"Frac.h"
+	"Pokemod.h"
+
+1180981258 /home/Ben/pokegen/src/pokemod/Status.h
+	<vector>
+	<map>
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+	"StatusEffect.h"
+
+1182557513 /home/Ben/pokegen/src/pokemod/StatusEffect.h
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+	"Ref.h"
+
+1180967644 /home/Ben/pokegen/src/pokemod/Store.h
+	<vector>
+	<map>
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+
+1180981206 /home/Ben/pokegen/src/pokemod/Tile.h
+	"Object.h"
+	"String.h"
+	"Pokemod.h"
+
+1180184978 /home/Ben/pokegen/src/pokemod/Time.h
+	"Object.h"
+	"String.h"
+
+1180184954 /home/Ben/pokegen/src/pokemod/Type.h
+	"Object.h"
+	"String.h"
+
+1180980250 source:/home/Ben/pokegen/src/pokemod/AbilityEffect.cpp
+	"AbilityEffect.h"
+
+1180843074 source:/home/Ben/pokegen/src/pokemod/Author.cpp
+	"Author.h"
+
+1182546082 source:/home/Ben/pokegen/src/pokemod/Badge.cpp
+	"Badge.h"
+
+1180980310 source:/home/Ben/pokegen/src/pokemod/CoinItem.cpp
+	"CoinItem.h"
+
+1180980336 source:/home/Ben/pokegen/src/pokemod/CoinList.cpp
+	"CoinList.h"
+
+1180843688 source:/home/Ben/pokegen/src/pokemod/Debug.cpp
+	"Debug.h"
+
+1182957435 source:/home/Ben/pokegen/src/pokemod/Dialog.cpp
+	"Dialog.h"
+
+1180843820 source:/home/Ben/pokegen/src/pokemod/EggGroup.cpp
+	"EggGroup.h"
+
+1180843936 source:/home/Ben/pokegen/src/pokemod/Frac.cpp
+	"Frac.h"
+
+1182978838 source:/home/Ben/pokegen/src/pokemod/Ini.cpp
+	"Ini.h"
+
+1180847420 source:/home/Ben/pokegen/src/pokemod/Object.cpp
+	"Object.h"
+
+1182954871 source:/home/Ben/pokegen/src/pokemod/Path.cpp
+	"Path.h"
+
+1180889888 source:/home/Ben/pokegen/src/pokemod/Ref.cpp
+	"Ref.h"
+
+1182978827 source:/home/Ben/pokegen/src/pokemod/String.cpp
+	"String.h"
+
+1180847608 source:/home/Ben/pokegen/src/pokemod/Type.cpp
+	"Type.h"
+
+1180843850 source:/home/Ben/pokegen/src/pokemod/Flag.cpp
+	"Flag.h"
+
+1180980428 source:/home/Ben/pokegen/src/pokemod/Item.cpp
+	"Item.h"
+
diff --git a/pokegen.layout b/pokegen.layout
index ffed79b4..dd06e572 100644
--- a/pokegen.layout
+++ b/pokegen.layout
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
-	<ActiveTarget name="pokemodr" />
+	<ActiveTarget name="pokemod" />
 	<File name="Changelog" open="1" top="0" tabpos="1">
-		<Cursor position="35" topLine="0" />
+		<Cursor position="400" topLine="0" />
 	</File>
 	<File name="Hat.h" open="0" top="0" tabpos="4">
 		<Cursor position="0" topLine="0" />
 	</File>
-	<File name="STANDARDS" open="0" top="0" tabpos="0">
-		<Cursor position="2" topLine="0" />
-	</File>
 	<File name="ai/Node.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="5594" topLine="174" />
 	</File>
@@ -43,8 +40,8 @@
 	<File name="pokemod/Debug.h" open="0" top="0" tabpos="4">
 		<Cursor position="3443" topLine="81" />
 	</File>
-	<File name="pokemod/Dialog.cpp" open="1" top="0" tabpos="3">
-		<Cursor position="1887" topLine="32" />
+	<File name="pokemod/Dialog.cpp" open="1" top="1" tabpos="3">
+		<Cursor position="23127" topLine="454" />
 	</File>
 	<File name="pokemod/Flag.cpp" open="0" top="0" tabpos="8">
 		<Cursor position="0" topLine="0" />
@@ -67,8 +64,8 @@
 	<File name="pokemod/Item.cpp" open="0" top="0" tabpos="2">
 		<Cursor position="0" topLine="0" />
 	</File>
-	<File name="pokemod/ItemEffect.cpp" open="1" top="0" tabpos="4">
-		<Cursor position="9194" topLine="312" />
+	<File name="pokemod/ItemEffect.cpp" open="1" top="0" tabpos="5">
+		<Cursor position="22729" topLine="823" />
 	</File>
 	<File name="pokemod/Map.h" open="0" top="0" tabpos="3">
 		<Cursor position="0" topLine="0" />
@@ -89,13 +86,13 @@
 		<Cursor position="3854" topLine="92" />
 	</File>
 	<File name="pokemod/Move.cpp" open="1" top="0" tabpos="7">
-		<Cursor position="3148" topLine="88" />
+		<Cursor position="3148" topLine="100" />
 	</File>
 	<File name="pokemod/Move.h" open="0" top="0" tabpos="2">
 		<Cursor position="0" topLine="0" />
 	</File>
-	<File name="pokemod/MoveEffect.cpp" open="1" top="0" tabpos="5">
-		<Cursor position="3806" topLine="118" />
+	<File name="pokemod/MoveEffect.cpp" open="1" top="0" tabpos="4">
+		<Cursor position="1392" topLine="1" />
 	</File>
 	<File name="pokemod/Nature.cpp" open="0" top="0" tabpos="5">
 		<Cursor position="0" topLine="0" />
@@ -110,7 +107,7 @@
 		<Cursor position="1366" topLine="15" />
 	</File>
 	<File name="pokemod/Path.cpp" open="0" top="0" tabpos="17">
-		<Cursor position="0" topLine="0" />
+		<Cursor position="1529" topLine="30" />
 	</File>
 	<File name="pokemod/Path.h" open="0" top="0" tabpos="18">
 		<Cursor position="0" topLine="0" />
@@ -122,7 +119,7 @@
 		<Cursor position="0" topLine="0" />
 	</File>
 	<File name="pokemod/Pokemod.cpp" open="1" top="0" tabpos="8">
-		<Cursor position="68376" topLine="2008" />
+		<Cursor position="52259" topLine="1579" />
 	</File>
 	<File name="pokemod/Pokemod.h" open="0" top="0" tabpos="12">
 		<Cursor position="0" topLine="0" />
@@ -136,14 +133,14 @@
 	<File name="pokemod/PokemonNature.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="1592" topLine="5" />
 	</File>
-	<File name="pokemod/Ref.h" open="1" top="0" tabpos="9">
-		<Cursor position="10520" topLine="313" />
+	<File name="pokemod/Ref.h" open="0" top="0" tabpos="7">
+		<Cursor position="7931" topLine="225" />
 	</File>
 	<File name="pokemod/Status.cpp" open="0" top="0" tabpos="10">
 		<Cursor position="1644" topLine="6" />
 	</File>
 	<File name="pokemod/StatusEffect.cpp" open="1" top="0" tabpos="6">
-		<Cursor position="2230" topLine="36" />
+		<Cursor position="2334" topLine="58" />
 	</File>
 	<File name="pokemod/StatusEffect.h" open="0" top="0" tabpos="0">
 		<Cursor position="156" topLine="0" />
@@ -151,11 +148,8 @@
 	<File name="pokemod/Store.h" open="0" top="0" tabpos="5">
 		<Cursor position="1494" topLine="0" />
 	</File>
-	<File name="pokemod/String.h" open="0" top="0" tabpos="0">
-		<Cursor position="1473" topLine="17" />
-	</File>
-	<File name="pokemod/TODO" open="1" top="1" tabpos="2">
-		<Cursor position="381" topLine="0" />
+	<File name="pokemod/TODO" open="1" top="0" tabpos="2">
+		<Cursor position="485" topLine="0" />
 	</File>
 	<File name="pokemod/Tile.h" open="0" top="0" tabpos="3">
 		<Cursor position="1357" topLine="15" />
diff --git a/pokemod/Badge.cpp b/pokemod/Badge.cpp
index 6edef52a..870ab46a 100644
--- a/pokemod/Badge.cpp
+++ b/pokemod/Badge.cpp
@@ -64,7 +64,7 @@ void PokeGen::PokeMod::Badge::Validate()
       LogVarNotValid("Badge", id, "face sprite", name);
       isValid = false;
    }
-   if (!Path(pokemod->GetPath() + "badge/badge/" + name + ".png").DoesExist())
+   if (!Path(pokemod->GetPath() + "badge/badge/" + name + ".png").DoesExist())
    {
       LogVarNotValid("Badge", id, "badge sprite", name);
       isValid = false;
@@ -84,15 +84,15 @@ void PokeGen::PokeMod::Badge::Validate(const wxListBox &output)
       output.Append(ConsoleLogVarNotSet("Badge", id, "name"));
       isValid = false;
    }
-   if (!Path(pokemod->GetPath() + "badge/face/" + name + ".png").DoesExist())
-   {
-      LogVarNotValid("Badge", id, "face sprite", name);
+   if (!Path(pokemod->GetPath() + "badge/face/" + name + ".png").DoesExist())
+   {
+      LogVarNotValid("Badge", id, "face sprite", name);
       output.Append(ConsoleLogVarNotValid("Badge", "face sprite", id, name));
       isValid = false;
    }
-   if (!Path(pokemod->GetPath() + "badge/badge/" + name + ".png").DoesExist())
-   {
-      LogVarNotValid("Badge", id, "badge sprite", name);
+   if (!Path(pokemod->GetPath() + "badge/badge/" + name + ".png").DoesExist())
+   {
+      LogVarNotValid("Badge", id, "badge sprite", name);
       output.Append(ConsoleLogVarNotValid("Badge", "badge sprite", id, name));
       isValid = false;
    }
@@ -150,13 +150,13 @@ void PokeGen::PokeMod::Badge::SetName(const String &n)
    name = n;
 }
 
-void PokeGen::PokeMod::Badge::SetFace(const Path &f)
+void PokeGen::PokeMod::Badge::SetFace(Path &f)
 {
    LogSetVar("Badge", id, "face", f, name);
    f.CopyTo(pokemod->GetPath() + "badge/face/" + name + ".png");
 }
 
-void PokeGen::PokeMod::Badge::SetBadge(const Path &b)
+void PokeGen::PokeMod::Badge::SetBadge(Path &b)
 {
    LogSetVar("Badge", id, "badge", b, name);
    b.CopyTo(pokemod->GetPath() + "badge/badge/" + name + ".png");
diff --git a/pokemod/Badge.h b/pokemod/Badge.h
index afb7f31c..f2e1bd5f 100644
--- a/pokemod/Badge.h
+++ b/pokemod/Badge.h
@@ -47,8 +47,8 @@ namespace PokeGen
             void ExportIni(std::ofstream &fout) const;
 
             void SetName(const String &n);
-            void SetFace(const Path &f);
-            void SetBadge(const Path &b);
+            void SetFace(Path &f);
+            void SetBadge(Path &b);
             void SetObey(const unsigned o);
             void SetStat(const unsigned s, const unsigned n, const unsigned d);
             void SetStatNum(const unsigned s, const unsigned n);
diff --git a/pokemod/Dialog.cpp b/pokemod/Dialog.cpp
index 0ff37cef..53e3afc0 100644
--- a/pokemod/Dialog.cpp
+++ b/pokemod/Dialog.cpp
@@ -51,9 +51,546 @@ void PokeGen::PokeMod::Dialog::Validate(const wxListBox &output)
 void PokeGen::PokeMod::Dialog::Validate()
 #endif
 {
-   LogValidateStart("Dialog", id);
-   // TODO (Validation#1#): Dialog Validation
-#  warning "Dialog Validation"
+   LogValidateStart("Dialog", id);
+   if (dialog == "")
+   {
+      LogVarNotSet("Dialog", id, "dialog");
+      isValid = false;
+   }
+   if (dialog.Count('%') % 2)
+   {
+      Log(String("Dialog: Command delimiter mismatch in %u", id), PM_DEBUG_ERROR);
+      isValid = false;
+   }
+   else
+   {
+      unsigned curCmd = DC_END;
+      unsigned numArgs = 0;
+      for (unsigned i = 0; i < dialog.length(); ++i)
+      {
+         switch (dialog[i])
+         {
+            case '%':
+               switch (curCmd)
+               {
+                  case DC_FLIP_FLAG ... DC_EXIT:
+                     if (numArgs != DialogCommandNumArgs[curCmd])
+                     {
+                        Log(String("Dialog: Invalid number of arguments (%u) for %s (%u wanted) in %u", numArgs, DialogCommandStr[curCmd], DialogCommandNumArgs[curCmd], id), PM_DEBUG_ERROR);
+                        isValid = false;
+                     }
+                     break;
+                  case DC_MENU:
+                     if (!(numArgs % 2))
+                     {
+                        Log(String("Dialog: Argument mismatch for Menu in %u", id), PM_DEBUG_ERROR);
+                        isValid = false;
+                     }
+                     break;
+                  case DC_END:
+                     String curCmdStr;
+                     for (; (dialog[i] != '%') && (dialog[i] != '#'); ++i)
+                        curCmdStr.append(1, dialog[i]);
+                     if (((curCmd = FindIn(DC_END, curCmdStr, DialogCommandAbbrStr)) == DC_END))
+                     {
+                        if (curCmdStr != "")
+                        {
+                           Log(String("Dialog: Invalid command \"%s\" in %u", curCmdStr.c_str(), id), PM_DEBUG_ERROR);
+                           isValid = false;
+                        }
+                        curCmd = DC_END;
+                     }
+                     numArgs = 0;
+               }
+            case '#':
+               if (curCmd != DC_END)
+               {
+                  String arg;
+                  unsigned tempU;
+                  unsigned long tempUL;
+                  Map *map = NULL;
+                  for (; (dialog[i] != '%') && (dialog[i] != '#'); ++i)
+                     arg.append(1, dialog[i]);
+                  ++numArgs;
+                  // TODO (Ben#1#): Argument parsing checks
+                  switch (curCmd)
+                  {
+                     case DC_FLIP_FLAG:
+                     case DC_SET_FLAG:
+                     case DC_UNSET_FLAG:
+                     case DC_RANDOMIZE_FLAG:
+                        if (numArgs == 1)
+                        {
+                           if (!arg.Convert(tempUL))
+                           {
+                              Log(String("Dialog: Bad flag in \"%s\" on %u", DialogCommandStr[curCmd], id), PM_DEBUG_ERROR);
+                              isValid = false;
+                           }
+                        }
+                        else
+                        {
+                           Log(String("Dialog: Too many arguments (%u) for \"%s\" in %u", numArgs, DialogCommandStr[curCmd], id), PM_DEBUG_ERROR);
+                           isValid = false;
+                        }
+                        break;
+                     case DC_TEST_FLAG:
+                        switch (numArgs)
+                        {
+                           case 1:
+                              if ((arg != "Call") || (arg != "Goto") || (arg != "0") || (arg != "1"))
+                              {
+                                 Log(String("Dialog: Invalid argument #1 in \"Test Flag\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 2:
+                              if ((arg != "Unset") || (arg != "Set") || (arg != "0") || (arg != "1"))
+                              {
+                                 Log(String("Dialog: Invalid argument #2 in \"Test Flag\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 3:
+                              if (!arg.Convert(tempUL))
+                              {
+                                 Log(String("Dialog: Bad flag in \"Test Flag\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 4:
+                           case 5:
+                              if (!arg.Convert(tempU) || !pokemod->GetDialog(tempU))
+                              {
+                                 Log(String("Dialog: Invalid argument #%u in \"Test Flag\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           default:
+                              Log(String("Dialog: Too many arguments (%u) for \"Test Flag\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                              isValid = false;
+                        }
+                        break;
+                     case DC_DIALOG:
+                        switch (numArgs)
+                        {
+                           case 1:
+                              if ((arg != "Call") || (arg != "Goto") || (arg != "0") || (arg != "1"))
+                              {
+                                 Log(String("Dialog: Invalid argument #1 in \"Dialog\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 2:
+                              if (!arg.Convert(tempU) || !pokemod->GetDialog(tempU))
+                              {
+                                 Log(String("Dialog: Invalid argument #%u in \"Dialog\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           default:
+                              Log(String("Dialog: Too many arguments (%u) for \"Dialog\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                              isValid = false;
+                        }
+                        break;
+                     case DC_YES_NO:
+                     case DC_DELETE_MOVE:
+                        switch (numArgs)
+                        {
+                           case 1:
+                              if ((arg != "Call") || (arg != "Goto") || (arg != "0") || (arg != "1"))
+                              {
+                                 Log(String("Dialog: Invalid argument #1 in \"%s\" in %u", DialogCommandStr[curCmd], id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 2:
+                           case 3:
+                              if (!arg.Convert(tempU) || !pokemod->GetDialog(tempU))
+                              {
+                                 Log(String("Dialog: Invalid argument #%u in \"%s\" in %u", numArgs, DialogCommandStr[curCmd], id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           default:
+                              Log(String("Dialog: Too many arguments (%u) for \"%s\" in %u", numArgs, DialogCommandStr[curCmd], id), PM_DEBUG_ERROR);
+                              isValid = false;
+                        }
+                        break;
+                     case DC_ITEM_SHOP:
+                        if (numArgs == 1)
+                        {
+                           if (!(arg.Convert(tempU) ? pokemod->GetStore(tempU) : pokemod->GetStore(arg)))
+                           {
+                              Log(String("Dialog: Invalid argument #1 in \"Test Flag\" in %u", id), PM_DEBUG_ERROR);
+                              isValid = false;
+                           }
+                        }
+                        else
+                        {
+                           Log(String("Dialog: Too many arguments (%u) for \"Test Flag\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                           isValid = false;
+                        }
+                        break;
+                     case DC_GIVE_ITEM:
+                     case DC_TAKE_ITEM:
+                     case DC_CHECK_ITEM:
+                        switch (numArgs)
+                        {
+                           case 1:
+                              if ((arg != "Call") || (arg != "Goto") || (arg != "0") || (arg != "1"))
+                              {
+                                 Log(String("Dialog: Invalid argument #1 in \"%s\" in %u", DialogCommandStr[curCmd], id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 2:
+                              if (!(arg.Convert(tempU) ? pokemod->GetItem(tempU) : pokemod->GetItem(arg)))
+                              {
+                                 Log(String("Dialog: Invalid argument #2 in \"%s\" in %u", DialogCommandStr[curCmd], id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 3:
+                           case 4:
+                              if (!arg.Convert(tempU) || !pokemod->GetDialog(tempU))
+                              {
+                                 Log(String("Dialog: Invalid argument #%u in \"%s\" in %u", numArgs, DialogCommandStr[curCmd], id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           default:
+                              Log(String("Dialog: Too many arguments (%u) for \"%s\" in %u", numArgs, DialogCommandStr[curCmd], id), PM_DEBUG_ERROR);
+                              isValid = false;
+                        }
+                        break;
+                     case DC_COIN_LIST:
+                        if (numArgs == 1)
+                        {
+                           if (!(arg.Convert(tempU) ? pokemod->GetCoinList(tempU) : pokemod->GetCoinList(arg)))
+                           {
+                              Log(String("Dialog: Invalid argument #1 in \"Coin List\" in %u", id), PM_DEBUG_ERROR);
+                              isValid = false;
+                           }
+                        }
+                        else
+                        {
+                           Log(String("Dialog: Too many arguments (%u) for \"Coin List\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                           isValid = false;
+                        }
+                        break;
+                     case DC_TEACH_MOVE:
+                        switch (numArgs)
+                        {
+                           case 1:
+                              if ((arg != "Call") || (arg != "Goto") || (arg != "0") || (arg != "1"))
+                              {
+                                 Log(String("Dialog: Invalid argument #1 in \"Teach Move\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 2:
+                              if (!(arg.Convert(tempU) ? pokemod->GetMove(tempU) : pokemod->GetMove(arg)))
+                              {
+                                 Log(String("Dialog: Invalid argument #2 in \"Teach Move\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 3:
+                           case 4:
+                           case 5:
+                              if (!arg.Convert(tempU) || !pokemod->GetDialog(tempU))
+                              {
+                                 Log(String("Dialog: Invalid argument #%u in \"Teach Move\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           default:
+                              Log(String("Dialog: Too many arguments (%u) for \"Teach Move\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                              isValid = false;
+                        }
+                        break;
+                     case DC_CHECK_MOVE:
+                        switch (numArgs)
+                        {
+                           case 1:
+                              if ((arg != "Call") || (arg != "Goto") || (arg != "0") || (arg != "1"))
+                              {
+                                 Log(String("Dialog: Invalid argument #1 in \"Check Move\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 2:
+                              if ((arg != "Lead") || (arg != "All") || (arg != "0") || (arg != "1"))
+                              {
+                                 Log(String("Dialog: Invalid argument #2 in \"Check Move\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 3:
+                              if (!(arg.Convert(tempU) ? pokemod->GetMove(tempU) : pokemod->GetMove(arg)))
+                              {
+                                 Log(String("Dialog: Invalid argument #3 in \"Check Move\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 4:
+                           case 5:
+                              if (!arg.Convert(tempU) || !pokemod->GetDialog(tempU))
+                              {
+                                 Log(String("Dialog: Invalid argument #%u in \"Check Move\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           default:
+                              Log(String("Dialog: Too many arguments (%u) for \"Check Move\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                              isValid = false;
+                        }
+                        break;
+                     case DC_GIVE_POKEMON:
+                        break;
+                     case DC_TAKE_POKEMON:
+                        break;
+                     case DC_SHOW_POKEMON:
+                        break;
+                     case DC_VIEW_POKEMON:
+                        break;
+                     case DC_GIVE_MONEY:
+                        if (numArgs == 1)
+                        {
+                           if (arg.Convert(tempUL))
+                           {
+                              if (pokemod->GetMaxMoney() < tempUL)
+                              {
+                                 Log(String("Dialog: More money given than can be held in \"Give Money\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                           }
+                           else
+                           {
+                              Log(String("Dialog: Invalid argument #1 in \"Give Money\" in %u", id), PM_DEBUG_ERROR);
+                              isValid = false;
+                           }
+                        }
+                        else
+                        {
+                           Log(String("Dialog: Too many arguments (%u) for \"Give Money\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                           isValid = false;
+                        }
+                        break;
+                     case DC_TAKE_MONEY:
+                        switch (numArgs)
+                        {
+                           case 1:
+                              if ((arg != "Call") || (arg != "Goto") || (arg != "0") || (arg != "1"))
+                              {
+                                 Log(String("Dialog: Invalid argument #1 in \"Take Money\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 2:
+                              if (arg.Convert(tempUL))
+                              {
+                                 if (pokemod->GetMaxMoney() < tempUL)
+                                 {
+                                    Log(String("Dialog: More money taken than can be held in \"Take Money\" in %u", id), PM_DEBUG_ERROR);
+                                    isValid = false;
+                                 }
+                              }
+                              else
+                              {
+                                 Log(String("Dialog: Invalid argument #2 in \"Take Money\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 3:
+                           case 4:
+                              if (!arg.Convert(tempU) || !pokemod->GetDialog(tempU))
+                              {
+                                 Log(String("Dialog: Invalid argument #%u in \"Take Money\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           default:
+                              Log(String("Dialog: Too many arguments (%u) for \"Take Money\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                              isValid = false;
+                        }
+                        break;
+                     case DC_MOVE_EFFECT:
+                        break;
+                     case DC_TURN_EFFECT:
+                        break;
+                     case DC_CHECK_DIRECTION:
+                        break;
+                     case DC_CHECK_ROSTER:
+                        break;
+                     case DC_CHECK_LEVELS:
+                        break;
+                     case DC_CHECK_SPECIES:
+                        break;
+                     case DC_CHECK_HELD_ITEMS:
+                        break;
+                     case DC_CHECK_MONEY:
+                        switch (numArgs)
+                        {
+                           case 1:
+                              if ((arg != "Call") || (arg != "Goto") || (arg != "0") || (arg != "1"))
+                              {
+                                 Log(String("Dialog: Invalid argument #1 in \"Check Money\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 2:
+                              if ((arg != "<") || (arg != ">") || (arg != "="))
+                              {
+                                 Log(String("Dialog: Invalid argument #2 in \"Check Money\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 3:
+                              if (arg.Convert(tempUL))
+                              {
+                                 if (pokemod->GetMaxMoney() < tempUL)
+                                 {
+                                    Log(String("Dialog: More money than can be held in \"Check Money\" in %u", id), PM_DEBUG_ERROR);
+                                    isValid = false;
+                                 }
+                              }
+                              else
+                              {
+                                 Log(String("Dialog: Invalid argument #3 in \"Check Money\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           case 4:
+                           case 5:
+                              if (!arg.Convert(tempU) || !pokemod->GetDialog(tempU))
+                              {
+                                 Log(String("Dialog: Invalid argument #%u in \"Check Money\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                              break;
+                           default:
+                              Log(String("Dialog: Too many arguments (%u) for \"Check Money\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                              isValid = false;
+                        }
+                        break;
+                     case DC_TRADE:
+                        break;
+                     case DC_DAYCARE:
+                        break;
+                     case DC_BATTLE:
+                        break;
+                     case DC_BADGE:
+                        break;
+                     case DC_WARP:
+                        if (numArgs == 1)
+                        {
+                           if (!(map = (arg.Convert(tempU) ? (Map *)pokemod->GetMap(tempU) : (Map *)pokemod->GetMap(arg)))
+                           {
+                                 Log(String("Dialog: Invalid argument #1 in \"Warp\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                           }
+                        }
+                        else if (numArgs == 2)
+                        {
+                           if (map)
+                           {
+                              if (!(arg.Convert(tempU) ? map->GetWarp(tempU) : map->GetWarp(arg)))
+                              {
+                                 Log(String("Dialog: Invalid argument #3 in \"Warp\" in %u", id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                           }
+                           else
+                              Log(String("Dialog: Unable to validate argument #2 in \"Warp\" in %u", id), PM_DEBUG_ERROR);
+                        }
+                        else
+                           Log(String("Dialog: Too many arguments (%u) for \"Warp\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                           isValid = false;
+                        break;
+                     case DC_NAME:
+                        if (numArgs == 1)
+                        {
+                           if (arg == "")
+                           {
+                              Log(String("Dialog: Invalid argument #1 in \"Name\" in %u", id), PM_DEBUG_ERROR);
+                              isValid = false;
+                           }
+                        }
+                        else
+                        {
+                           Log(String("Dialog: Too many arguments (%u) for \"Name\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                           isValid = false;
+                        }
+                        break;
+                     case DC_MUSIC:
+                     case DC_SOUND_EFFECT:
+                        if (numArgs == 1)
+                        {
+                           if (!Path(pokemod->GetPath() + "sound/" + arg).DoesExist())
+                           {
+                              Log(String("Dialog: Invalid argument #1 in \"%s\" in %u", DialogCommandStr[curCmd], id), PM_DEBUG_ERROR);
+                              isValid = false;
+                           }
+                        }
+                        else
+                        {
+                           Log(String("Dialog: Too many arguments (%u) for \"%s\" in %u", numArgs, DialogCommandStr[curCmd], id), PM_DEBUG_ERROR);
+                           isValid = false;
+                        }
+                        break;
+                     case DC_TIMER:
+                        break;
+                     case DC_MAP_SIGN:
+                        break;
+                     case DC_WILD_SCOPE:
+                        break;
+                     case DC_SAFARI:
+                        break;
+                     case DC_HEAL_PARTY:
+                     case DC_REFRESH:
+                     case DC_CLEAR:
+                     case DC_PAUSE:
+                     case DC_NEW_LINE:
+                     case DC_EXIT:
+                        Log(String("Dialog: Too many arguments (%u) for \"%s\" in %u", numArgs, DialogCommandStr[curCmd], id), PM_DEBUG_ERROR);
+                        isValid = false;
+                        break;
+                     case DC_MENU:
+                        if (numArgs == 1)
+                        {
+                           if ((arg != "Call") || (arg != "Goto") || (arg != "0") || (arg != "1"))
+                           {
+                              Log(String("Dialog: Invalid argument #1 in \"Menu\" in %u", id), PM_DEBUG_ERROR);
+                              isValid = false;
+                           }
+                        }
+                        else if (numArgs % 2)
+                        {
+                           if (arg.Convert(tempU))
+                           {
+                              if (!pokemod->GetDialog(tempU))
+                              {
+                                 Log(String("Dialog: Invalid argument #%u in \"Menu\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                                 isValid = false;
+                              }
+                           }
+                           else
+                           {
+                              Log(String("Dialog: Invalid argument #%u in \"Menu\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                              isValid = false;
+                           }
+                        }
+                        else if (arg == "")
+                        {
+                           Log(String("Dialog: Invalid argument #%u in \"Menu\" in %u", numArgs, id), PM_DEBUG_ERROR);
+                           isValid = false;
+                        }
+                  }
+               }
+         }
+      }
+   }
    LogValidateOver("Dialog", id, isValid);
 }
 
@@ -102,5 +639,5 @@ void PokeGen::PokeMod::Dialog::InsertDialogCommand(const String &cmd, const unsi
       Log(String("Dialog: Position out-of-range in %u", id), PM_DEBUG_ERROR);
       return;
    }
-   dialog.insert();
+   dialog.insert(pos, cmd);
 }
diff --git a/pokemod/Dialog.h b/pokemod/Dialog.h
index 8c81cca2..28f879cf 100644
--- a/pokemod/Dialog.h
+++ b/pokemod/Dialog.h
@@ -23,8 +23,9 @@
 
 #ifndef __POKEMOD_DIALOG__
 #define __POKEMOD_DIALOG__
-
-#include "Object.h"
+
+#include "Object.h"
+#include "Path.h"
 #include "String.h"
 #include "Pokemod.h"
 
diff --git a/pokemod/Ini.cpp b/pokemod/Ini.cpp
index 6fd7347f..e78adef6 100644
--- a/pokemod/Ini.cpp
+++ b/pokemod/Ini.cpp
@@ -47,6 +47,21 @@ void PokeGen::PokeMod::Ini::Export(const String &p) const
    Export(fout);
 }
 
+void PokeGen::PokeMod::Ini::AddField(const String &n, const bool v)
+{
+   fields[n] = v ? "true" : "false";
+}
+
+void PokeGen::PokeMod::Ini::AddField(const String &n, const char v)
+{
+   fields[n] = String("%c", v);
+}
+
+void PokeGen::PokeMod::Ini::AddField(const String &n, const unsigned char v)
+{
+   fields[n] = String("%x", v);
+}
+
 void PokeGen::PokeMod::Ini::AddField(const String &n, const int v)
 {
    fields[n] = String("%d", v);
@@ -57,36 +72,54 @@ void PokeGen::PokeMod::Ini::AddField(const String &n, const unsigned v)
    fields[n] = String("%u", v);
 }
 
-void PokeGen::PokeMod::Ini::AddField(const String &n, const unsigned char v)
-{
-   fields[n] = String("%x", v);
-}
-
-void PokeGen::PokeMod::Ini::AddField(const String &n, const char *v)
-{
-   fields[n] = v;
-}
-
+void PokeGen::PokeMod::Ini::AddField(const String &n, const double v)
+{
+   fields[n] = String("%f", v);
+}
+
 void PokeGen::PokeMod::Ini::AddField(const String &n, const String &v)
 {
    fields[n] = v;
 }
 
-void PokeGen::PokeMod::Ini::AddField(const String &n, const bool v)
-{
-   fields[n] = v ? "true" : "false";
-}
-
-void PokeGen::PokeMod::Ini::AddField(const String &n, const double v)
-{
-   fields[n] = String("%f", v);
-}
-
 PokeGen::PokeMod::String PokeGen::PokeMod::Ini::GetName() const
 {
    return name;
 }
 
+void PokeGen::PokeMod::Ini::GetValue(const String &field, bool &val, const bool def)
+{
+   if (!fields.count(field))
+   {
+      val = def;
+      return;
+   }
+   if (!fields[field].Convert(val))
+      val = def;
+}
+
+void PokeGen::PokeMod::Ini::GetValue(const String &field, char &val, const char def)
+{
+   if (!fields.count(field))
+   {
+      val = def;
+      return;
+   }
+   if (!fields[field].Convert(val))
+      val = def;
+}
+
+void PokeGen::PokeMod::Ini::GetValue(const String &field, unsigned char &val, const unsigned char def)
+{
+   if (!fields.count(field))
+   {
+      val = def;
+      return;
+   }
+   if (!fields[field].Convert(val))
+      val = def;
+}
+
 void PokeGen::PokeMod::Ini::GetValue(const String &field, int &val, const int def)
 {
    if (!fields.count(field))
@@ -94,10 +127,8 @@ void PokeGen::PokeMod::Ini::GetValue(const String &field, int &val, const int de
       val = def;
       return;
    }
-   long temp;
-   char *end;
-   temp = std::strtol(fields[field], &end, 10);
-   val = ((temp < INT_MIN) || (INT_MAX < temp) || *end) ? def : temp;
+   if (!fields[field].Convert(val))
+      val = def;
 }
 
 void PokeGen::PokeMod::Ini::GetValue(const String &field, unsigned &val, const unsigned def)
@@ -107,25 +138,43 @@ void PokeGen::PokeMod::Ini::GetValue(const String &field, unsigned &val, const u
       val = def;
       return;
    }
-   unsigned long temp;
-   char *end;
-   temp = std::strtoul(fields[field], &end, 10);
-   val = ((UINT_MAX < temp) || *end) ? def : temp;
-}
-
-void PokeGen::PokeMod::Ini::GetValue(const String &field, unsigned char &val, const unsigned char def)
-{
-   if (!fields.count(field))
-   {
-      val = def;
-      return;
-   }
-   unsigned long temp;
-   char *end;
-   temp = std::strtoul(fields[field], &end, 10);
-   val = ((UCHAR_MAX < temp) || *end) ? def : temp;
-}
-
+   if (!fields[field].Convert(val))
+      val = def;
+}
+
+void PokeGen::PokeMod::Ini::GetValue(const String &field, long &val, const long def)
+{
+   if (!fields.count(field))
+   {
+      val = def;
+      return;
+   }
+   if (!fields[field].Convert(val))
+      val = def;
+}
+
+void PokeGen::PokeMod::Ini::GetValue(const String &field, unsigned long &val, const unsigned long def)
+{
+   if (!fields.count(field))
+   {
+      val = def;
+      return;
+   }
+   if (!fields[field].Convert(val))
+      val = def;
+}
+
+void PokeGen::PokeMod::Ini::GetValue(const String &field, double &val, const double def)
+{
+   if (!fields.count(field))
+   {
+      val = def;
+      return;
+   }
+   if (!fields[field].Convert(val))
+      val = def;
+}
+
 void PokeGen::PokeMod::Ini::GetValue(const String &field, String &val, const String &def)
 {
    if (!fields.count(field))
@@ -136,34 +185,6 @@ void PokeGen::PokeMod::Ini::GetValue(const String &field, String &val, const Str
    val = fields[field];
 }
 
-void PokeGen::PokeMod::Ini::GetValue(const String &field, bool &val, const bool def)
-{
-   if (!fields.count(field))
-   {
-      val = def;
-      return;
-   }
-   if (fields[field] == "true")
-      val = true;
-   else if (fields[field] == "false")
-      val = false;
-   else
-      val = def;
-}
-
-void PokeGen::PokeMod::Ini::GetValue(const String &field, double &val, const double def)
-{
-   if (!fields.count(field))
-   {
-      val = def;
-      return;
-   }
-   char *end;
-   val = std::strtod(fields[field].c_str(), &end);
-   if (*end)
-      val = def;
-}
-
 bool PokeGen::PokeMod::Ini::IsValid() const
 {
    return isValid;
@@ -175,7 +196,7 @@ bool PokeGen::PokeMod::Ini::Load(std::ifstream &file)
    std::string field;
    std::string value;
    fields.clear();
-   unsigned pos;
+   size_t pos;
    name = "";
    isValid = true;
    std::getline(file, line);
diff --git a/pokemod/Ini.h b/pokemod/Ini.h
index 79b1c07f..685b16cf 100644
--- a/pokemod/Ini.h
+++ b/pokemod/Ini.h
@@ -41,21 +41,26 @@ namespace PokeGen
             void Export(std::ofstream &file) const;
             void Export(const String &p) const;
             
+            void AddField(const String &n, const bool v);
+            void AddField(const String &n, const char v);
+            void AddField(const String &n, const unsigned char v);
             void AddField(const String &n, const int v);
             void AddField(const String &n, const unsigned v);
-            void AddField(const String &n, const unsigned char v);
-            void AddField(const String &n, const char *v);
+            void AddField(const String &n, const long v);
+            void AddField(const String &n, const unsigned long v);
+            void AddField(const String &n, const double v);
             void AddField(const String &n, const String &v);
-            void AddField(const String &n, const bool v);
-            void AddField(const String &n, const double v);
             
             String GetName() const;
+            void GetValue(const String &field, bool &val, const bool def = true);
+            void GetValue(const String &field, char &val, const char def = CHAR_MAX);
+            void GetValue(const String &field, unsigned char &val, const unsigned char def = UCHAR_MAX);
             void GetValue(const String &field, int &val, const int def = INT_MAX);
             void GetValue(const String &field, unsigned &val, const unsigned def = UINT_MAX);
-            void GetValue(const String &field, unsigned char &val, const unsigned char def = UCHAR_MAX);
+            void GetValue(const String &field, long &val, const long def = LONG_MAX);
+            void GetValue(const String &field, unsigned long &val, const unsigned long def = ULONG_MAX);
+            void GetValue(const String &field, double &val, const double def = 0);
             void GetValue(const String &field, String &val, const String &def = "");
-            void GetValue(const String &field, bool &val, const bool def = true);
-            void GetValue(const String &field, double &val, const double def = 0);
             
             bool IsValid() const;
          protected:
diff --git a/pokemod/Path.cpp b/pokemod/Path.cpp
index a8fa5ebb..2e7e8a20 100644
--- a/pokemod/Path.cpp
+++ b/pokemod/Path.cpp
@@ -59,7 +59,7 @@ bool PokeGen::PokeMod::Path::DoesExist()
 
 bool PokeGen::PokeMod::Path::HasExtension(const String &ext)
 {
-   unsigned pos = rfind('.');
+   size_t pos = rfind('.');
    bool ret = true;
    String fileExt(substr(pos + 1));
    if ((pos == npos) || (pos + 1 == length()) || (fileExt.length() != ext.length()))
diff --git a/pokemod/Pokemod.cpp b/pokemod/Pokemod.cpp
index 14c1170e..80182f00 100644
--- a/pokemod/Pokemod.cpp
+++ b/pokemod/Pokemod.cpp
@@ -23,7 +23,7 @@
 
 #include "Pokemod.h"
 
-PokeGen::PokeMod::Pokemod::Pokemod() :
+PokeGen::PokeMod::Pokemod::Pokemod(const String &f) :
       title(""),
       version(""),
       description(""),
@@ -60,27 +60,16 @@ PokeGen::PokeMod::Pokemod::Pokemod() :
       startCoordinate(0, 0),
       startDirection(UINT_MAX),
       startDialog(UINT_MAX),
-      walkSkin(""),
-      bikeSkin(""),
-      surfSkin(""),
-      flySkin(""),
-      fishSkin(""),
-      surfFishSkin(""),
       superPCUname(""),
       superPCPasswd(""),
       struggleMove(UINT_MAX),
       confuseMove(UINT_MAX),
-      typeChart(1, 1, Frac(1, 1, true))
+      typeChart(1, 1, Frac(1, 1, true)),
+      file(f)
 {
    LogCtor("Pokemod", 0);
 }
 
-PokeGen::PokeMod::Pokemod::Pokemod(std::ifstream &fin)
-{
-   LogCtorIni("Pokemod", 0);
-   ImportIni(fin);
-}
-
 PokeGen::PokeMod::Pokemod::~Pokemod()
 {
    LogDtor("Pokemod", 0);
@@ -178,52 +167,34 @@ void PokeGen::PokeMod::Pokemod::Validate()
       LogVarNotValid("Pokemod", 0, "startDialog");
       isValid = false;
    }
-   if (!walkSkin.DoesExist())
+   if (!Path(GetPath() + "skins/walk.png").DoesExist())
    {
-      if (walkSkin == "")
-         LogVarNotSet("Pokemod", 0, "walkSkin");
-      else
-         LogVarNotValid("Pokemod", 0, "walkSkin");
+      LogVarNotValid("Pokemod", 0, "walkSkin");
       isValid = false;
    }
-   if (!bikeSkin.DoesExist())
+   if (!Path(GetPath() + "skins/bike.png").DoesExist())
    {
-      if (bikeSkin == "")
-         LogVarNotSet("Pokemod", 0, "bikeSkin");
-      else
-         LogVarNotValid("Pokemod", 0, "bikeSkin");
+      LogVarNotValid("Pokemod", 0, "bikeSkin");
       isValid = false;
    }
-   if (!surfSkin.DoesExist())
+   if (!Path(GetPath() + "skins/surf.png").DoesExist())
    {
-      if (surfSkin == "")
-         LogVarNotSet("Pokemod", 0, "surfSkin");
-      else
-         LogVarNotValid("Pokemod", 0, "surfSkin");
+      LogVarNotValid("Pokemod", 0, "surfSkin");
       isValid = false;
    }
-   if (!flySkin.DoesExist())
+   if (!Path(GetPath() + "skins/fly.png").DoesExist())
    {
-      if (flySkin == "")
-         LogVarNotSet("Pokemod", 0, "flySkin");
-      else
-         LogVarNotValid("Pokemod", 0, "flySkin");
+      LogVarNotValid("Pokemod", 0, "flySkin");
       isValid = false;
    }
-   if (!fishSkin.DoesExist())
+   if (!Path(GetPath() + "skins/fish.png").DoesExist())
    {
-      if (fishSkin == "")
-         LogVarNotSet("Pokemod", 0, "fishSkin");
-      else
-         LogVarNotValid("Pokemod", 0, "fishSkin");
+      LogVarNotValid("Pokemod", 0, "fishSkin");
       isValid = false;
    }
-   if (!surfFishSkin.DoesExist())
+   if (!Path(GetPath() + "skins/surfFish.png").DoesExist())
    {
-      if (surfFishSkin == "")
-         LogVarNotSet("Pokemod", 0, "surfFishSkin");
-      else
-         LogVarNotValid("Pokemod", 0, "surfFishSkin");
+      LogVarNotValid("Pokemod", 0, "surfFishSkin");
       isValid = false;
    }
    if (superPCUname == "")
@@ -937,88 +908,40 @@ void PokeGen::PokeMod::Pokemod::Validate(const wxListBox &output)
       output.Append(ConsoleLogVarNotValid("Pokemod", 0, "startDialog"));
       isValid = false;
    }
-   if (!walkSkin.DoesExist())
+   if (!Path(GetPath() + "skins/walk.png").DoesExist())
    {
-      if (walkSkin == "")
-      {
-         LogVarNotSet("Pokemod", 0, "walkSkin");
-         output.Append(ConsoleLogVarNotSet("Pokemod", 0, "walkSkin"));
-      }
-      else
-      {
-         LogVarNotValid("Pokemod", 0, "walkSkin");
-         output.Append(ConsoleLogVarNotValid("Pokemod", 0, "walkSkin"));
-      }
+      LogVarNotValid("Pokemod", 0, "walkSkin");
+      output.Append(ConsoleLogVarNotValid("Pokemod", 0, "walkSkin"));
       isValid = false;
    }
-   if (!bikeSkin.DoesExist())
+   if (!Path(GetPath() + "skins/bike.png").DoesExist())
    {
-      if (bikeSkin == "")
-      {
-         LogVarNotSet("Pokemod", 0, "bikeSkin");
-         output.Append(ConsoleLogVarNotSet("Pokemod", 0, "bikeSkin"));
-      }
-      else
-      {
-         LogVarNotValid("Pokemod", 0, "bikeSkin");
-         output.Append(ConsoleLogVarNotValid("Pokemod", 0, "bikeSkin"));
-      }
+      LogVarNotValid("Pokemod", 0, "bikeSkin");
+      output.Append(ConsoleLogVarNotValid("Pokemod", 0, "bikeSkin"));
       isValid = false;
    }
-   if (!surfSkin.DoesExist())
+   if (!Path(GetPath() + "skins/surf.png").DoesExist())
    {
-      if (surfSkin == "")
-      {
-         LogVarNotSet("Pokemod", 0, "surfSkin");
-         output.Append(ConsoleLogVarNotSet("Pokemod", 0, "surfSkin"));
-      }
-      else
-      {
-         LogVarNotValid("Pokemod", 0, "surfSkin");
-         output.Append(ConsoleLogVarNotValid("Pokemod", 0, "surfSkin"));
-      }
+      LogVarNotValid("Pokemod", 0, "surfSkin");
+      output.Append(ConsoleLogVarNotValid("Pokemod", 0, "surfSkin"));
       isValid = false;
    }
-   if (!flySkin.DoesExist())
+   if (!Path(GetPath() + "skins/fly.png").DoesExist())
    {
-      if (flySkin == "")
-      {
-         LogVarNotSet("Pokemod", 0, "flySkin");
-         output.Append(ConsoleLogVarNotSet("Pokemod", 0, "flySkin"));
-      }
-      else
-      {
-         LogVarNotValid("Pokemod", 0, "flySkin");
-         output.Append(ConsoleLogVarNotValid("Pokemod", 0, "flySkin"));
-      }
+      LogVarNotValid("Pokemod", 0, "flySkin");
+      output.Append(ConsoleLogVarNotValid("Pokemod", 0, "flySkin"));
       isValid = false;
    }
-   if (!fishSkin.DoesExist())
+   if (!Path(GetPath() + "skins/fish.png").DoesExist())
    {
-      if (fishSkin == "")
-      {
-         LogVarNotSet("Pokemod", 0, "fishSkin");
-         output.Append(ConsoleLogVarNotSet("Pokemod", 0, "fishSkin"));
-      }
-      else
-      {
-         LogVarNotValid("Pokemod", 0, "fishSkin");
-         output.Append(ConsoleLogVarNotValid("Pokemod", 0, "fishSkin"));
-      }
+      LogVarNotValid("Pokemod", 0, "fishSkin");
+      output.Append(ConsoleLogVarNotValid("Pokemod", 0, "fishSkin"));
       isValid = false;
    }
-   if (!surfFishSkin.DoesExist())
+   if (!Path(GetPath() + "skins/surfFish.png").DoesExist())
    {
-      if (surfFishSkin == "")
-      {
-         LogVarNotSet("Pokemod", 0, "surfFishSkin");
-         output.Append(ConsoleLogVarNotSet("Pokemod", 0, "surfFishSkin"));
-      }
-      else
-      {
-         LogVarNotValid("Pokemod", 0, "surfFishSkin");
-         output.Append(ConsoleLogVarNotValid("Pokemod", 0, "surfFishSkin"));
-      }
+      LogVarNotValid("Pokemod", 0, "surfFishSkin");
+      output.Append(ConsoleLogVarNotValid("Pokemod", 0, "surfFishSkin"));
       isValid = false;
    }
    if (superPCUname == "")
@@ -1675,11 +1598,20 @@ void PokeGen::PokeMod::Pokemod::Validate(const wxListBox &output)
 }
 #endif
 
-void PokeGen::PokeMod::Pokemod::ImportIni(std::ifstream &fin)
+PokeGen::PokeMod::Path PokeGen::PokeMod::Pokemod::GetPath() const
+{
+   Path f = file;
+   f.erase(f.rfind('/') + 1);
+   return f;
+}
+
+void PokeGen::PokeMod::Pokemod::ImportIni(const String &f)
 {
    LogImportStart("Pokemod");
    std::vector<Ini> sections;
    Ini meta("unset");
+   std::ifstream fin(f, std::ios::in);
+   file = f;
    while (fin.peek() != '\n')
    {
       Ini curSection(fin);
@@ -1733,12 +1665,6 @@ void PokeGen::PokeMod::Pokemod::ImportIni(std::ifstream &fin)
          startCoordinate.Set(i, j);
          curSection.GetValue("startDirection", startDirection);
          curSection.GetValue("startDialog", startDialog);
-         curSection.GetValue("walkSkin", walkSkin);
-         curSection.GetValue("bikeSkin", bikeSkin);
-         curSection.GetValue("surfSkin", surfSkin);
-         curSection.GetValue("flySkin", flySkin);
-         curSection.GetValue("fishSkin", fishSkin);
-         curSection.GetValue("surfFishSkin", surfFishSkin);
          curSection.GetValue("superPCUname", superPCUname);
          curSection.GetValue("superPCPasswd", superPCPasswd);
          curSection.GetValue("struggleMove", struggleMove);
@@ -1926,10 +1852,12 @@ void PokeGen::PokeMod::Pokemod::ImportIni(std::ifstream &fin)
    LogImportOver("Pokemod", 0, title);
 }
 
-void PokeGen::PokeMod::Pokemod::ExportIni(std::ofstream &fout) const
+void PokeGen::PokeMod::Pokemod::ExportIni(const String &f) const
 {
    LogExportStart("Pokemod", 0, title);
    Ini exPokemod("pokemod");
+   std::ofstream fout(f, std::ios::out);
+   file = f.c_str();
    exPokemod.AddField("title", title);
    exPokemod.AddField("version", version);
    exPokemod.AddField("description", description);
@@ -1968,12 +1896,6 @@ void PokeGen::PokeMod::Pokemod::ExportIni(std::ofstream &fout) const
    exPokemod.AddField("startCoordinate-y", startCoordinate.GetY());
    exPokemod.AddField("startDirection", startDirection);
    exPokemod.AddField("startDialog", startDialog);
-   exPokemod.AddField("walkSkin", walkSkin);
-   exPokemod.AddField("bikeSkin", bikeSkin);
-   exPokemod.AddField("surfSkin", surfSkin);
-   exPokemod.AddField("flySkin", flySkin);
-   exPokemod.AddField("fishSkin", fishSkin);
-   exPokemod.AddField("surfFishSkin", surfFishSkin);
    exPokemod.AddField("superPCUname", superPCUname);
    exPokemod.AddField("superPCPasswd", superPCPasswd);
    exPokemod.AddField("struggleMove", struggleMove);
@@ -2326,40 +2248,40 @@ void PokeGen::PokeMod::Pokemod::SetStartDialog(const unsigned s)
       startDialog = s;
 }
 
-void PokeGen::PokeMod::Pokemod::SetWalkSkin(const Path &w)
+void PokeGen::PokeMod::Pokemod::SetWalkSkin(Path &w)
 {
    LogSetVar("Pokemod", 0, "walkSkin", w);
-   walkSkin = w;
+   w.CopyTo(GetPath() + "skins/walk.png");
 }
 
-void PokeGen::PokeMod::Pokemod::SetBikeSkin(const Path &b)
+void PokeGen::PokeMod::Pokemod::SetBikeSkin(Path &b)
 {
    LogSetVar("Pokemod", 0, "bikeSkin", b);
-   bikeSkin = b;
+   b.CopyTo(GetPath() + "skins/bike.png");
 }
 
-void PokeGen::PokeMod::Pokemod::SetSurfSkin(const Path &s)
+void PokeGen::PokeMod::Pokemod::SetSurfSkin(Path &s)
 {
    LogSetVar("Pokemod", 0, "surfSkin", s);
-   surfSkin = s;
+   s.CopyTo(GetPath() + "skins/surf.png");
 }
 
-void PokeGen::PokeMod::Pokemod::SetFlySkin(const Path &f)
+void PokeGen::PokeMod::Pokemod::SetFlySkin(Path &f)
 {
    LogSetVar("Pokemod", 0, "flySkin", f);
-   flySkin = f;
+   f.CopyTo(GetPath() + "skins/fly.png");
 }
 
-void PokeGen::PokeMod::Pokemod::SetFishSkin(const Path &f)
+void PokeGen::PokeMod::Pokemod::SetFishSkin(Path &f)
 {
    LogSetVar("Pokemod", 0, "fishSkin", f);
-   fishSkin = f;
+   f.CopyTo(GetPath() + "skins/fish.png");
 }
 
-void PokeGen::PokeMod::Pokemod::SetSurfFishSkin(const Path &s)
+void PokeGen::PokeMod::Pokemod::SetSurfFishSkin(Path &s)
 {
    LogSetVar("Pokemod", 0, "surfFishSkin", s);
-   surfFishSkin = s;
+   s.CopyTo(GetPath() + "skins/surfFish.png");
 }
 
 void PokeGen::PokeMod::Pokemod::SetSuperPCUname(const String &u)
@@ -2674,40 +2596,40 @@ PokeGen::PokeMod::String PokeGen::PokeMod::Pokemod::GetStartDialogString() const
    return "";
 }
 
-PokeGen::PokeMod::Path PokeGen::PokeMod::Pokemod::GetWalkSkin() const
+bool PokeGen::PokeMod::Pokemod::GetWalkSkin() const
 {
-   LogFetchVar("Pokemod", 0, "walkSkin", walkSkin);
-   return walkSkin;
+   LogFetchVar("Pokemod", 0, "walkSkin", 0);
+   return Path(GetPath() + "skins/walk.png").DoesExist();
 }
 
-PokeGen::PokeMod::Path PokeGen::PokeMod::Pokemod::GetBikeSkin() const
+bool PokeGen::PokeMod::Pokemod::GetBikeSkin() const
 {
-   LogFetchVar("Pokemod", 0, "bikeSkin", bikeSkin);
-   return bikeSkin;
+   LogFetchVar("Pokemod", 0, "bikeSkin", 0);
+   return Path(GetPath() + "skins/nike.png").DoesExist();
 }
 
-PokeGen::PokeMod::Path PokeGen::PokeMod::Pokemod::GetSurfSkin() const
+bool PokeGen::PokeMod::Pokemod::GetSurfSkin() const
 {
-   LogFetchVar("Pokemod", 0, "surfSkin", surfSkin);
-   return surfSkin;
+   LogFetchVar("Pokemod", 0, "surfSkin", 0);
+   return Path(GetPath() + "skins/surf.png").DoesExist();
 }
 
-PokeGen::PokeMod::Path PokeGen::PokeMod::Pokemod::GetFlySkin() const
+bool PokeGen::PokeMod::Pokemod::GetFlySkin() const
 {
-   LogFetchVar("Pokemod", 0, "flySkin", flySkin);
-   return flySkin;
+   LogFetchVar("Pokemod", 0, "flySkin", 0);
+   return Path(GetPath() + "skins/fly.png").DoesExist();
 }
 
-PokeGen::PokeMod::Path PokeGen::PokeMod::Pokemod::GetFishSkin() const
+bool PokeGen::PokeMod::Pokemod::GetFishSkin() const
 {
-   LogFetchVar("Pokemod", 0, "fishSkin", fishSkin);
-   return fishSkin;
+   LogFetchVar("Pokemod", 0, "fishSkin", 0);
+   return Path(GetPath() + "skins/fish.png").DoesExist();
 }
 
-PokeGen::PokeMod::Path PokeGen::PokeMod::Pokemod::GetSurfFishSkin() const
+bool PokeGen::PokeMod::Pokemod::GetSurfFishSkin() const
 {
-   LogFetchVar("Pokemod", 0, "surfFishSkin", surfFishSkin);
-   return surfFishSkin;
+   LogFetchVar("Pokemod", 0, "surfFishSkin", 0);
+   return Path(GetPath() + "skins/surfFish.png").DoesExist();
 }
 
 PokeGen::PokeMod::String PokeGen::PokeMod::Pokemod::GetSuperPCUname() const
diff --git a/pokemod/Pokemod.h b/pokemod/Pokemod.h
index a1bbc096..fa0b3ea1 100644
--- a/pokemod/Pokemod.h
+++ b/pokemod/Pokemod.h
@@ -33,24 +33,26 @@
 #include <string>
 #include "pokemod_inc.h"
 #include "Object.h"
+#include "Frac.h"
+#include "Ini.h"
+#include "Path.h"
+#include "Point.h"
 #include "Ref.h"
+#include "String.h"
 #include "Ability.h"
 #include "Author.h"
 #include "Badge.h"
 #include "CoinList.h"
 #include "Dialog.h"
 #include "EggGroup.h"
-#include "Ini.h"
 #include "Item.h"
 #include "ItemStorage.h"
 #include "Map.h"
 #include "Move.h"
 #include "Nature.h"
-#include "Point.h"
 #include "Pokemon.h"
 #include "Status.h"
 #include "Store.h"
-#include "String.h"
 #include "Tile.h"
 #include "Time.h"
 #include "Type.h"
@@ -62,12 +64,13 @@ namespace PokeGen
       class Pokemod : public Object
       {
          public:
-            Pokemod();
-            Pokemod(std::ifstream &fin);
+            Pokemod(const String &f);
             ~Pokemod();
             
-            void ImportIni(std::ifstream &fin);
-            void ExportIni(std::ofstream &fout) const;
+            void ImportIni(const String &f);
+            void ExportIni(const String &f) const;
+            
+            Path GetPath() const;
             
             unsigned MaxCompatability(const Pokemod &p) const;
             
@@ -116,12 +119,12 @@ namespace PokeGen
             void SetStartDirection(const unsigned s);
             void SetStartDirection(const String &s);
             void SetStartDialog(const unsigned s);
-            void SetWalkSkin(const Path &w);
-            void SetBikeSkin(const Path &b);
-            void SetSurfSkin(const Path &s);
-            void SetFlySkin(const Path &f);
-            void SetFishSkin(const Path &f);
-            void SetSurfFishSkin(const Path &s); 
+            void SetWalkSkin(Path &w);
+            void SetBikeSkin(Path &b);
+            void SetSurfSkin(Path &s);
+            void SetFlySkin(Path &f);
+            void SetFishSkin(Path &f);
+            void SetSurfFishSkin(Path &s);
             void SetSuperPCUname(const String &u);
             void SetSuperPCPasswd(const String &p);
             void SetStruggleMove(const unsigned s);
@@ -173,12 +176,12 @@ namespace PokeGen
             String GetStartDirectionString() const;
             unsigned GetStartDialog() const;
             String GetStartDialogString() const;
-            Path GetWalkSkin() const;
-            Path GetBikeSkin() const;
-            Path GetSurfSkin() const;
-            Path GetFlySkin() const;
-            Path GetFishSkin() const;
-            Path GetSurfFishSkin() const;
+            bool GetWalkSkin() const;
+            bool GetBikeSkin() const;
+            bool GetSurfSkin() const;
+            bool GetFlySkin() const;
+            bool GetFishSkin() const;
+            bool GetSurfFishSkin() const;
             String GetSuperPCUname() const;
             String GetSuperPCPasswd() const;
             unsigned GetStruggleMove() const;
@@ -373,12 +376,6 @@ namespace PokeGen
             Point startCoordinate;
             unsigned startDirection;
             unsigned startDialog;
-            Path walkSkin;
-            Path bikeSkin;
-            Path surfSkin;
-            Path flySkin;
-            Path fishSkin;
-            Path surfFishSkin;
             String superPCUname;
             String superPCPasswd;
             unsigned struggleMove;
@@ -403,6 +400,8 @@ namespace PokeGen
             std::vector<Tile> tiles;
             std::vector<Time> times;
             std::vector<Type> types;
+            
+            String file;
       };
    }
 }
diff --git a/pokemod/Pokemon.cpp b/pokemod/Pokemon.cpp
index 31b7ccd3..b699e540 100644
--- a/pokemod/Pokemon.cpp
+++ b/pokemod/Pokemon.cpp
@@ -102,25 +102,25 @@ void PokeGen::PokeMod::Pokemon::Validate()
       LogVarNotValid("Pokemon", id, "frontMaleSprite", name);
       isValid = false;
    }
-   if (!Path(pokemod->GetPath() + "images/pokemon/back/" + (pokemod->IsGenderAllowed() ? "male/" : "") + name + ".png").DoesExist())
+   if (!Path(pokemod->GetPath() + "images/pokemon/back/" + (pokemod->IsGenderAllowed() ? "male/" : "") + name + ".png").DoesExist())
    {
       LogVarNotSet("Pokemon", id, "backMaleSprite", name);
       isValid = false;
-   }
-   if (pokemod->IsGenderAllowed())
-   {
-      if (!Path(pokemod->GetPath() + "images/pokemon/front/female/" + name + ".png").DoesExist())
-      {
-         LogVarNotValid("Pokemon", id, "frontFemaleSprite", name);
-         isValid = false;
-      }
-      if (!Path(pokemod->GetPath() + "images/pokemon/back/female/" + name + ".png").DoesExist())
-      {
-         LogVarNotSet("Pokemon", id, "backFemaleSprite", name);
-         isValid = false;
-      }
-   }
-   if (!Path(pokemod->GetPath() + "images/pokemon/list/" + name + ".png").DoesExist())
+   }
+   if (pokemod->IsGenderAllowed())
+   {
+      if (!Path(pokemod->GetPath() + "images/pokemon/front/female/" + name + ".png").DoesExist())
+      {
+         LogVarNotValid("Pokemon", id, "frontFemaleSprite", name);
+         isValid = false;
+      }
+      if (!Path(pokemod->GetPath() + "images/pokemon/back/female/" + name + ".png").DoesExist())
+      {
+         LogVarNotSet("Pokemon", id, "backFemaleSprite", name);
+         isValid = false;
+      }
+   }
+   if (!Path(pokemod->GetPath() + "images/pokemon/list/" + name + ".png").DoesExist())
    {
       LogVarNotValid("Pokemon", id, "listSprite", name);
       isValid = false;
@@ -361,36 +361,36 @@ void PokeGen::PokeMod::Pokemon::Validate(const wxListBox &output)
       output.Append(ConsoleLogVarNotValid("Pokemon", id, "heightInches", name));
       isValid = false;
    }
-   if (!Path(pokemod->GetPath() + "images/pokemon/front/male/" + name + ".png").DoesExist())
+   if (!Path(pokemod->GetPath() + "images/pokemon/front/male/" + name + ".png").DoesExist())
    {
       LogVarNotValid("Pokemon", id, "frontMaleSprite", name);
       output.Append(ConsoleLogVarNotValid("Pokemon", id, "frontMaleSprite", name));
       isValid = false;
    }
-   if (!Path(pokemod->GetPath() + "images/pokemon/back/male/" + name + ".png").DoesExist())
-   {
-      LogVarNotValid("Pokemon", id, "backMaleSprite", name);
-      output.Append(ConsoleLogVarNotValid("Pokemon", id, "backMaleSprite", name));
-      isValid = false;
-   }
-   if (!Path(pokemod->GetPath() + "images/pokemon/front/female/" + name + ".png").DoesExist())
-   {
-      LogVarNotValid("Pokemon", id, "frontFemaleSprite", name);
-      output.Append(ConsoleLogVarNotValid("Pokemon", id, "frontFemaleSprite", name));
-      isValid = false;
-   }
-   if (!Path(pokemod->GetPath() + "images/pokemon/back/female/" + name + ".png").DoesExist())
-   {
-      LogVarNotValid("Pokemon", id, "backFemaleSprite", name);
-      output.Append(ConsoleLogVarNotValid("Pokemon", id, "backFemrontMaleSprite", name));
-      isValid = false;
-   }
-   if (!Path(pokemod->GetPath() + "images/pokemon/list/" + name + ".png").DoesExist())
-   {
-      LogVarNotValid("Pokemon", id, "listSprite", name);
-      output.Append(ConsoleLogVarNotValid("Pokemon", id, "listSprite", name));
-      isValid = false;
-   }
+   if (!Path(pokemod->GetPath() + "images/pokemon/back/male/" + name + ".png").DoesExist())
+   {
+      LogVarNotValid("Pokemon", id, "backMaleSprite", name);
+      output.Append(ConsoleLogVarNotValid("Pokemon", id, "backMaleSprite", name));
+      isValid = false;
+   }
+   if (!Path(pokemod->GetPath() + "images/pokemon/front/female/" + name + ".png").DoesExist())
+   {
+      LogVarNotValid("Pokemon", id, "frontFemaleSprite", name);
+      output.Append(ConsoleLogVarNotValid("Pokemon", id, "frontFemaleSprite", name));
+      isValid = false;
+   }
+   if (!Path(pokemod->GetPath() + "images/pokemon/back/female/" + name + ".png").DoesExist())
+   {
+      LogVarNotValid("Pokemon", id, "backFemaleSprite", name);
+      output.Append(ConsoleLogVarNotValid("Pokemon", id, "backFemrontMaleSprite", name));
+      isValid = false;
+   }
+   if (!Path(pokemod->GetPath() + "images/pokemon/list/" + name + ".png").DoesExist())
+   {
+      LogVarNotValid("Pokemon", id, "listSprite", name);
+      output.Append(ConsoleLogVarNotValid("Pokemon", id, "listSprite", name));
+      isValid = false;
+   }
    if (!pokemod->GetPokemon(eggSpecies))
    {
       LogVarNotValid("Pokemon", id, "eggSpecies", name);
@@ -835,40 +835,40 @@ void PokeGen::PokeMod::Pokemon::SetPokedexEntry(const String &p)
    pokedexEntry = p;
 }
 
-void PokeGen::PokeMod::Pokemon::SetFrontMaleSprite(const Path &f)
+void PokeGen::PokeMod::Pokemon::SetFrontMaleSprite(Path &f)
 {
    LogSetVar("Pokemon", id, "frontMaleSprite", f, name);
    f.CopyTo(pokemod->GetPath() + "pokemon/front/" + (pokemod->IsGenderAllowed() ? "male/" : "") + name + ".png");
 }
 
-void PokeGen::PokeMod::Pokemon::SetBackMaleSprite(const Path &b)
+void PokeGen::PokeMod::Pokemon::SetBackMaleSprite(Path &b)
 {
    LogSetVar("Pokemon", id, "backMaleSprite", b, name);
-   b.CopyTo(pokemod->GetPath() + "pokemon/back/" + (pokemod->IsGenderAllowed() ? "male/" : "") + name + ".png");
-}
-
-void PokeGen::PokeMod::Pokemon::SetFrontFemaleSprite(const Path &f)
-{
-   if (pokemod->IsGenderAllowed())
-   {
-      LogSetVar("Pokemon", id, "frontFemaleSprite", f, name);
-      f.CopyTo(pokemod->GetPath() + "pokemon/front/female/" + name + ".png");
-   }
-}
-
-void PokeGen::PokeMod::Pokemon::SetBackFemaleSprite(const Path &b)
-{
-   if (pokemod->IsGenderAllowed())
-   {
-      LogSetVar("Pokemon", id, "backFemaleSprite", b, name);
-      b.CopyTo(pokemod->GetPath() + "pokemon/back/female/" + name + ".png");
-   }
-}
-
-void PokeGen::PokeMod::Pokemon::SetListSprite(const Path &l)
+   b.CopyTo(pokemod->GetPath() + "pokemon/back/" + (pokemod->IsGenderAllowed() ? "male/" : "") + name + ".png");
+}
+
+void PokeGen::PokeMod::Pokemon::SetFrontFemaleSprite(Path &f)
+{
+   if (pokemod->IsGenderAllowed())
+   {
+      LogSetVar("Pokemon", id, "frontFemaleSprite", f, name);
+      f.CopyTo(pokemod->GetPath() + "pokemon/front/female/" + name + ".png");
+   }
+}
+
+void PokeGen::PokeMod::Pokemon::SetBackFemaleSprite(Path &b)
+{
+   if (pokemod->IsGenderAllowed())
+   {
+      LogSetVar("Pokemon", id, "backFemaleSprite", b, name);
+      b.CopyTo(pokemod->GetPath() + "pokemon/back/female/" + name + ".png");
+   }
+}
+
+void PokeGen::PokeMod::Pokemon::SetListSprite(Path &l)
 {
    LogSetVar("Pokemon", id, "listSprite", l, name);
-   l.CopyTo(pokemod->GetPath() + "pokemon/list/" + name + ".png");
+   l.CopyTo(pokemod->GetPath() + "pokemon/list/" + name + ".png");
 }
 
 void PokeGen::PokeMod::Pokemon::SetGenderFactor(const Frac &g)
@@ -1044,37 +1044,39 @@ PokeGen::PokeMod::String PokeGen::PokeMod::Pokemon::GetPokedexEntry() const
 bool PokeGen::PokeMod::Pokemon::GetFrontMaleSprite() const
 {
    LogFetchVar("Pokemon", id, "frontMaleSprite", -1, name);
-   return Path(pokemod->GetPath() + "pokemon/front/" + (pokemod->IsGenderAllowed() ? "male/" : "") + name + ".png").DoesExist();
+   return Path(pokemod->GetPath() + "pokemon/front/" + (pokemod->IsGenderAllowed() ? "male/" : "") + name + ".png").DoesExist();
 }
 
 bool PokeGen::PokeMod::Pokemon::GetBackMaleSprite() const
 {
-   LogFetchVar("Pokemon", id, "backMaleSprite", -1, name);
-   return Path(pokemod->GetPath() + "pokemon/back/" + (pokemod->IsGenderAllowed() ? "male/" : "") + name + ".png").DoesExist();
-}
-
-bool PokeGen::PokeMod::Pokemon::GetFrontFemaleSprite() const
-{
-   if (pokemod->IsGenderAllowed())
-   {
-      LogFetchVar("Pokemon", id, "frontFemaleSprite", -1, name);
-      return Path(pokemod->GetPath() + "pokemon/front/female/" + name + ".png").DoesExist();
-   }
-}
-
-bool PokeGen::PokeMod::Pokemon::GetBackFemaleSprite() const
-{
-   if (pokemod->IsGenderAllowed())
-   {
-      LogFetchVar("Pokemon", id, "backFemaleSprite", -1, name);
-      return Path(pokemod->GetPath() + "pokemon/back/female/" + name + ".png").DoesExist();
-   }
-}
-
+   LogFetchVar("Pokemon", id, "backMaleSprite", -1, name);
+   return Path(pokemod->GetPath() + "pokemon/back/" + (pokemod->IsGenderAllowed() ? "male/" : "") + name + ".png").DoesExist();
+}
+
+bool PokeGen::PokeMod::Pokemon::GetFrontFemaleSprite() const
+{
+   if (pokemod->IsGenderAllowed())
+   {
+      LogFetchVar("Pokemon", id, "frontFemaleSprite", -1, name);
+      return Path(pokemod->GetPath() + "pokemon/front/female/" + name + ".png").DoesExist();
+   }
+   return false;
+}
+
+bool PokeGen::PokeMod::Pokemon::GetBackFemaleSprite() const
+{
+   if (pokemod->IsGenderAllowed())
+   {
+      LogFetchVar("Pokemon", id, "backFemaleSprite", -1, name);
+      return Path(pokemod->GetPath() + "pokemon/back/female/" + name + ".png").DoesExist();
+   }
+   return false;
+}
+
 bool PokeGen::PokeMod::Pokemon::GetListSprite() const
 {
-   LogFetchVar("Pokemon", id, "listSprite", -1, name);
-   return Path(pokemod->GetPath() + "pokemon/list/" + name + ".png").DoesExist();
+   LogFetchVar("Pokemon", id, "listSprite", -1, name);
+   return Path(pokemod->GetPath() + "pokemon/list/" + name + ".png").DoesExist();
 }
 
 PokeGen::PokeMod::Frac PokeGen::PokeMod::Pokemon::GetGenderFactor() const
diff --git a/pokemod/Pokemon.h b/pokemod/Pokemon.h
index baf545f1..d0544d77 100644
--- a/pokemod/Pokemon.h
+++ b/pokemod/Pokemon.h
@@ -71,11 +71,11 @@ namespace PokeGen
             void SetHeightFeet(const unsigned f);
             void SetHeightInches(const unsigned char i);
             void SetPokedexEntry(const String &p);
-            void SetFrontMaleSprite(const Path &f);
-            void SetBackMaleSprite(const Path &b);
-            void SetFrontFemaleSprite(const Path &f);
-            void SetBackFemaleSprite(const Path &b);
-            void SetListSprite(const Path &l);
+            void SetFrontMaleSprite(Path &f);
+            void SetBackMaleSprite(Path &b);
+            void SetFrontFemaleSprite(Path &f);
+            void SetBackFemaleSprite(Path &b);
+            void SetListSprite(Path &l);
             void SetGenderFactor(const Frac &g);
             void SetGenderFactor(const unsigned n, const unsigned d);
             void SetGenderFactorNumerator(const unsigned n);
@@ -106,8 +106,8 @@ namespace PokeGen
             String GetPokedexEntry() const;
             bool GetFrontMaleSprite() const;
             bool GetBackMaleSprite() const;
-            bool GetFrontFemaleSprite() const;
-            bool GetBackFemaleSprite() const;
+            bool GetFrontFemaleSprite() const;
+            bool GetBackFemaleSprite() const;
             bool GetListSprite() const;
             Frac GetGenderFactor() const;
             unsigned GetGenderFactorNumerator() const;
diff --git a/pokemod/Ref.h b/pokemod/Ref.h
index 6ad80cc2..0b39c919 100644
--- a/pokemod/Ref.h
+++ b/pokemod/Ref.h
@@ -243,12 +243,12 @@ namespace PokeGen
       
       enum EnumFlagValue
       {
-         FV_SET = 0,
-         FV_UNSET = 1,
+         FV_UNSET = 0,
+         FV_SET = 1,
          FV_IGNORE = 2,
          FV_END = 3
       };
-      const char *FlagValueStr[FV_END] = {"Set", "Unset", "Ignore"};
+      const char *FlagValueStr[FV_END] = {"Unset", "Set", "Ignore"};
       
       
       enum EnumCoinItemType
@@ -456,7 +456,7 @@ namespace PokeGen
       };
       const char *WarpTypeStr[WT_END] = {"Door/Stair", "Warp Pad", "Hole", "Boundary"};
       
-      enum EnumDialogCommands
+      enum EnumDialogCommand
       {
          DC_FLIP_FLAG = 0,
          DC_SET_FLAG = 1,
diff --git a/pokemod/StatusEffect.h b/pokemod/StatusEffect.h
index 683b37eb..ec38e4d1 100644
--- a/pokemod/StatusEffect.h
+++ b/pokemod/StatusEffect.h
@@ -27,7 +27,6 @@
 #include "Object.h"
 #include "String.h"
 #include "Pokemod.h"
-#include "Status.h"
 #include "Ref.h"
 
 namespace PokeGen
diff --git a/pokemod/String.cpp b/pokemod/String.cpp
index 0d8b8367..61bc7e37 100644
--- a/pokemod/String.cpp
+++ b/pokemod/String.cpp
@@ -37,7 +37,7 @@ PokeGen::PokeMod::String::String(const char *fmt, ...)
    va_end(args);
 }
 
-void PokeGen::PokeMod::String::printf(const char *fmt, ...)
+void PokeGen::PokeMod::String::Printf(const char *fmt, ...)
 {
    va_list args;
    va_start(args, fmt);
@@ -45,7 +45,7 @@ void PokeGen::PokeMod::String::printf(const char *fmt, ...)
    va_end(args);
 }
 
-void PokeGen::PokeMod::String::printf(const char *fmt, va_list &args)
+void PokeGen::PokeMod::String::Printf(const char *fmt, va_list &args)
 {
    Format unit;
    std::stringstream ss;
@@ -130,7 +130,116 @@ void PokeGen::PokeMod::String::printf(const char *fmt, va_list &args)
          append(1, *p);
       ++p;
    }
+}
+
+unsigned PokeGen::PokeMod::String::Count(const char c) const
+{
+   unsigned count = 0;
+   for (unsigned i = 0; i < length(); ++i)
+      count += (*this[i] == c);
+   return count;
+}
+
+unsigned PokeGen::PokeMod::String::Count(const String &s, bool canOverlap) const
+{
+   unsigned count = 0;
+   for (unsigned i = 0; i + s.length() < length(); ++i)
+   {
+      if (this->substr(i, i + s.length() - 1) == s)
+      {
+         ++count;
+         if (!canOverlap)
+            i += s.length() - 1;
+      }
+   }
+   return count;
 }
+
+bool PokeGen::PokeMod::String::Convert(bool &val) const
+{
+   if (*this == "true")
+      val = true;
+   else if (*this == "false")
+      val = false;
+   else
+      return false;
+   return true;
+}
+
+bool PokeGen::PokeMod::String::Convert(char &val) const
+{
+   long temp;
+   char *end;
+   temp = std::strtol(c_str(), &end, 10);
+   if ((CHAR_MIN <= temp) && (temp <= CHAR_MAX) && !*end)
+      val = temp;
+   else
+      return false;
+   return true;
+}
+
+bool PokeGen::PokeMod::String::Convert(unsigned char &val) const
+{
+   unsigned long temp;
+   char *end;
+   temp = std::strtoul(c_str(), &end, 10);
+   if ((temp <= UCHAR_MAX) && !*end)
+      val = temp;
+   else
+      return false;
+   return true;
+}
+
+bool PokeGen::PokeMod::String::Convert(int &val) const
+{
+   long temp;
+   char *end;
+   temp = std::strtol(c_str(), &end, 10);
+   if ((INT_MIN <= temp) && (temp <= INT_MAX) && !*end)
+      val = temp;
+   else
+      return false;
+   return true;
+}
+
+bool PokeGen::PokeMod::String::Convert(unsigned &val) const
+{
+   unsigned long temp;
+   char *end;
+   temp = std::strtoul(c_str(), &end, 10);
+   if ((temp <= UINT_MAX) && !*end)
+      val = temp;
+   else
+      return false;
+   return true;
+}
+
+bool PokeGen::PokeMod::String::Convert(long &val) const
+{
+   long temp;
+   char *end;
+   temp = std::strtol(c_str(), &end, 10);
+   if (!*end)
+      val = temp;
+   return !*end;
+}
+
+bool PokeGen::PokeMod::String::Convert(unsigned long &val) const
+{
+   unsigned long temp;
+   char *end;
+   temp = std::strtoul(c_str(), &end, 10);
+   if (!*end)
+      val = temp;
+   return !*end;
+}
+
+bool PokeGen::PokeMod::String::Convert(double &val) const
+{
+   char *end;
+   val = std::strtod(c_str(), &end);
+   return !*end;
+}
 
 PokeGen::PokeMod::String::operator const char *() const
 {
diff --git a/pokemod/String.h b/pokemod/String.h
index 2058ed4b..a2e84301 100644
--- a/pokemod/String.h
+++ b/pokemod/String.h
@@ -39,9 +39,21 @@ namespace PokeGen
          public:
             String(const std::string &str);
             String(const char *fmt = "", ...);
-            
-            void printf(const char *fmt, ...);
-            
+
+            void Printf(const char *fmt, ...);
+
+            unsigned Count(const char c) const;
+            unsigned Count(const String &s, bool canOverlap = false) const;
+            
+            bool Convert(bool &val) const;
+            bool Convert(char &val) const;
+            bool Convert(unsigned char &val) const;
+            bool Convert(int &val) const;
+            bool Convert(unsigned &val) const;
+            bool Convert(long &val) const;
+            bool Convert(unsigned long &val) const;
+            bool Convert(double &val) const;
+
             operator const char *() const;
          private:
             typedef union
@@ -55,8 +67,8 @@ namespace PokeGen
                long l;
                unsigned long ul;
             }Format;
-            
-            void printf(const char *fmt, va_list &args);
+
+            void Printf(const char *fmt, va_list &args);
       };
    }
 }
diff --git a/pokemod/TODO b/pokemod/TODO
index 5cdf7c56..83de910a 100644
--- a/pokemod/TODO
+++ b/pokemod/TODO
@@ -16,10 +16,10 @@ Effect Switches
 ItemEffect
 MoveEffect
 
----------------
-Enum <-> String
----------------
-Class Template-ize (???)
+----
+Enum
+----
+Class Template-ize (for implicit char * <-> enum <-> int conversions) (???)
 
 =================
 Showstopper
@@ -28,16 +28,11 @@ Showstopper
 ----------
 Validation
 ----------
-StatusEffect
+StatusEffect
 Dialog
 ItemEffect
 MoveEffect
 
--------------
-Miscellaneous
--------------
-Dialog commands
-
 =================
 Important
 =================
diff --git a/pokemod/pokemod_inc.h b/pokemod/pokemod_inc.h
index ebcd4348..aae1032a 100644
--- a/pokemod/pokemod_inc.h
+++ b/pokemod/pokemod_inc.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        pokemod/pokemod_inc.h
-// Purpose:     Include header for a PokéMod
+// Purpose:     Include header for the PokéMod library
 // Author:      Ben Boeckel
 // Modified by: Ben Boeckel
 // Created:     Thu Mar 22 20:53:22 2007
diff --git a/pokemodr/gui/PokeModr.pjd b/pokemodr/gui/PokeModr.pjd
index 37120f79..8aa49979 100644
--- a/pokemodr/gui/PokeModr.pjd
+++ b/pokemodr/gui/PokeModr.pjd
@@ -51,7 +51,6 @@
 // Author:      %AUTHOR%
 // Modified by: 
 // Created:     %DATE%
-// RCS-ID:      
 // Copyright:   %COPYRIGHT%
 // Licence:     
 //    This program is free software; you can redistribute it and/or modify
@@ -76,7 +75,6 @@
 // Author:      %AUTHOR%
 // Modified by: 
 // Created:     %DATE%
-// RCS-ID:      
 // Copyright:   %COPYRIGHT%
 // Licence:     
 //    This program is free software; you can redistribute it and/or modify
@@ -10912,7 +10910,7 @@ Dialog depending on whether it could or not"</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">"m_Compare"</string>
-                    <string name="proxy-Strings">"&gt;&lt;"</string>
+                    <string name="proxy-Strings">"=|&gt;|&lt;"</string>
                     <string name="proxy-Initial value">"="</string>
                     <string name="proxy-Help text">""</string>
                     <string name="proxy-Tooltip text">""</string>
@@ -21093,7 +21091,7 @@ another dialog depending on its truth"</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">"m_Compare"</string>
-                    <string name="proxy-Strings">"&gt;&lt;"</string>
+                    <string name="proxy-Strings">"=|&gt;|&lt;"</string>
                     <string name="proxy-Initial value">"="</string>
                     <string name="proxy-Help text">""</string>
                     <string name="proxy-Tooltip text">""</string>
@@ -22243,7 +22241,7 @@ on whether it meets the requirements or not"</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">"m_Compare"</string>
-                    <string name="proxy-Strings">"&gt;&lt;"</string>
+                    <string name="proxy-Strings">"=|&gt;|&lt;"</string>
                     <string name="proxy-Initial value">"="</string>
                     <string name="proxy-Help text">""</string>
                     <string name="proxy-Tooltip text">""</string>
@@ -23373,68 +23371,6 @@ on whether the species meet  the requirements or not"</string>
                     <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                     <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                   </document>
-                  <document>
-                    <string name="title">"wxComboBox: ID_COMPARE"</string>
-                    <string name="type">"dialog-control-document"</string>
-                    <string name="filename">""</string>
-                    <string name="icon-name">"combobox"</string>
-                    <long name="is-transient">0</long>
-                    <long name="owns-file">1</long>
-                    <long name="title-mode">0</long>
-                    <long name="locked">0</long>
-                    <string name="created">"17/2/2007"</string>
-                    <string name="proxy-type">"wbComboBoxProxy"</string>
-                    <string name="proxy-Id name">"ID_COMPARE"</string>
-                    <long name="proxy-Id value">10247</long>
-                    <string name="proxy-Class">"wxComboBox"</string>
-                    <string name="proxy-Base class">"wxComboBox"</string>
-                    <bool name="proxy-External implementation">1</bool>
-                    <bool name="proxy-Separate files">0</bool>
-                    <string name="proxy-Implementation filename">""</string>
-                    <string name="proxy-Header filename">""</string>
-                    <string name="proxy-Member variable name">"m_Compare"</string>
-                    <string name="proxy-Strings">"&gt;&lt;"</string>
-                    <string name="proxy-Initial value">"="</string>
-                    <string name="proxy-Help text">""</string>
-                    <string name="proxy-Tooltip text">""</string>
-                    <string name="proxy-Background colour">""</string>
-                    <string name="proxy-Foreground colour">""</string>
-                    <string name="proxy-Font">""</string>
-                    <bool name="proxy-Hidden">0</bool>
-                    <bool name="proxy-Enabled">1</bool>
-                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                    <string name="proxy-Data variable">""</string>
-                    <string name="proxy-Data validator">""</string>
-                    <bool name="proxy-wxCB_SIMPLE">0</bool>
-                    <bool name="proxy-wxCB_DROPDOWN">0</bool>
-                    <bool name="proxy-wxCB_READONLY">1</bool>
-                    <bool name="proxy-wxCB_SORT">0</bool>
-                    <bool name="proxy-wxWANTS_CHARS">0</bool>
-                    <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                    <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                    <string name="proxy-Custom styles">""</string>
-                    <long name="proxy-X">-1</long>
-                    <long name="proxy-Y">-1</long>
-                    <long name="proxy-Width">-1</long>
-                    <long name="proxy-Height">-1</long>
-                    <string name="proxy-AlignH">"Left"</string>
-                    <string name="proxy-AlignV">"Top"</string>
-                    <long name="proxy-Stretch factor">0</long>
-                    <long name="proxy-Border">5</long>
-                    <bool name="proxy-wxLEFT">1</bool>
-                    <bool name="proxy-wxRIGHT">1</bool>
-                    <bool name="proxy-wxTOP">0</bool>
-                    <bool name="proxy-wxBOTTOM">0</bool>
-                    <bool name="proxy-wxSHAPED">0</bool>
-                    <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                    <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                    <string name="proxy-Custom arguments">""</string>
-                    <string name="proxy-Custom ctor arguments">""</string>
-                    <long name="proxy-Grid x">2</long>
-                    <long name="proxy-Grid y">1</long>
-                    <long name="proxy-Span x">1</long>
-                    <long name="proxy-Span y">1</long>
-                  </document>
                   <document>
                     <string name="title">"wxComboBox: ID_NUMBER"</string>
                     <string name="type">"dialog-control-document"</string>
@@ -26474,7 +26410,7 @@ a name for the slot. Future calls will print the name."</string>
             </document>
           </document>
           <document>
-            <string name="title">"GiveBadge"</string>
+            <string name="title">"Give Badge"</string>
             <string name="type">"dialog-document"</string>
             <string name="filename">""</string>
             <string name="icon-name">"dialog"</string>
@@ -26496,10 +26432,10 @@ a name for the slot. Future calls will print the name."</string>
             <string name="proxy-Class">"GiveBadge"</string>
             <string name="proxy-Base class">"wxDialog"</string>
             <string name="proxy-Window kind">"wxDialog"</string>
-            <string name="proxy-Implementation filename">"givebadge.cpp"</string>
-            <string name="proxy-Header filename">"givebadge.h"</string>
+            <string name="proxy-Implementation filename">"dlgGiveBadge.cpp"</string>
+            <string name="proxy-Header filename">"dlgGiveBadge.h"</string>
             <string name="proxy-XRC filename">""</string>
-            <string name="proxy-Title">"GiveBadge"</string>
+            <string name="proxy-Title">"Give Badge"</string>
             <bool name="proxy-Centre">1</bool>
             <string name="proxy-Icon">""</string>
             <bool name="proxy-Dialog units">0</bool>
@@ -26558,14 +26494,6 @@ a name for the slot. Future calls will print the name."</string>
               <string name="proxy-type">"wbBoxSizerProxy"</string>
               <string name="proxy-Orientation">"Vertical"</string>
               <string name="proxy-Member variable name">""</string>
-              <string name="proxy-AlignH">"Centre"</string>
-              <string name="proxy-AlignV">"Centre"</string>
-              <long name="proxy-Stretch factor">0</long>
-              <long name="proxy-Border">5</long>
-              <bool name="proxy-wxLEFT">1</bool>
-              <bool name="proxy-wxRIGHT">1</bool>
-              <bool name="proxy-wxTOP">1</bool>
-              <bool name="proxy-wxBOTTOM">1</bool>
               <bool name="proxy-wxSHAPED">0</bool>
               <bool name="proxy-wxADJUST_MINSIZE">0</bool>
               <bool name="proxy-wxFIXED_MINSIZE">0</bool>
@@ -27597,7 +27525,7 @@ a name for the slot. Future calls will print the name."</string>
             <string name="proxy-Implementation filename">"menuEntry.cpp"</string>
             <string name="proxy-Header filename">"menuEntry.h"</string>
             <string name="proxy-XRC filename">""</string>
-            <string name="proxy-Title">"wxPanel ID_MENU_ITEM"</string>
+            <string name="proxy-Title">"MenuItem"</string>
             <bool name="proxy-Centre">0</bool>
             <string name="proxy-Icon">""</string>
             <bool name="proxy-Dialog units">0</bool>
@@ -33024,7 +32952,7 @@ if the trade went through or not"</string>
             <string name="id-suffix">""</string>
             <long name="use-xrc">0</long>
             <long name="working-mode">0</long>
-            <string name="event-handler-0">"wxEVT_INIT_DIALOG|OnInitDialog"</string>
+            <string name="event-handler-0">"wxEVT_INIT_DIALOG|OnInitDialog|||"</string>
             <string name="proxy-Id name">"ID_DLG_YES_NO"</string>
             <long name="proxy-Id value">10065</long>
             <string name="proxy-Class">"YesNoDialog"</string>
@@ -87848,8 +87776,6 @@ It hands control over to another Dialog depending on the answer."</string>
               <string name="proxy-Implementation filename">""</string>
               <string name="proxy-Header filename">""</string>
               <string name="proxy-Member variable name">""</string>
-              <string name="proxy-Tab label">"Data"</string>
-              <string name="proxy-Tab icon">""</string>
               <long name="proxy-PPU X">1</long>
               <long name="proxy-PPU Y">1</long>
               <long name="proxy-Units X">0</long>
@@ -87896,6 +87822,8 @@ It hands control over to another Dialog depending on the answer."</string>
               <string name="proxy-Custom arguments">""</string>
               <string name="proxy-Custom ctor arguments">""</string>
               <bool name="proxy-AUI manager">0</bool>
+              <string name="proxy-Tab label">"Data"</string>
+              <string name="proxy-Tab icon">""</string>
               <document>
                 <string name="title">"wxBoxSizer H"</string>
                 <string name="type">"dialog-control-document"</string>
@@ -88010,8 +87938,6 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-Tab label">"Meta"</string>
-                    <string name="proxy-Tab icon">""</string>
                     <long name="proxy-PPU X">1</long>
                     <long name="proxy-PPU Y">1</long>
                     <long name="proxy-Units X">0</long>
@@ -88058,6 +87984,8 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Custom arguments">""</string>
                     <string name="proxy-Custom ctor arguments">""</string>
                     <bool name="proxy-AUI manager">0</bool>
+                    <string name="proxy-Tab label">"Meta"</string>
+                    <string name="proxy-Tab icon">""</string>
                     <document>
                       <string name="title">"wxBoxSizer V"</string>
                       <string name="type">"dialog-control-document"</string>
@@ -88805,8 +88733,6 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-Tab label">"Rules"</string>
-                    <string name="proxy-Tab icon">""</string>
                     <long name="proxy-PPU X">1</long>
                     <long name="proxy-PPU Y">1</long>
                     <long name="proxy-Units X">0</long>
@@ -88853,6 +88779,8 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Custom arguments">""</string>
                     <string name="proxy-Custom ctor arguments">""</string>
                     <bool name="proxy-AUI manager">0</bool>
+                    <string name="proxy-Tab label">"Rules"</string>
+                    <string name="proxy-Tab icon">""</string>
                     <document>
                       <string name="title">"wxBoxSizer V"</string>
                       <string name="type">"dialog-control-document"</string>
@@ -88967,8 +88895,6 @@ It hands control over to another Dialog depending on the answer."</string>
                           <string name="proxy-Implementation filename">""</string>
                           <string name="proxy-Header filename">""</string>
                           <string name="proxy-Member variable name">""</string>
-                          <string name="proxy-Tab label">"General"</string>
-                          <string name="proxy-Tab icon">""</string>
                           <long name="proxy-PPU X">1</long>
                           <long name="proxy-PPU Y">1</long>
                           <long name="proxy-Units X">0</long>
@@ -89015,6 +88941,8 @@ It hands control over to another Dialog depending on the answer."</string>
                           <string name="proxy-Custom arguments">""</string>
                           <string name="proxy-Custom ctor arguments">""</string>
                           <bool name="proxy-AUI manager">0</bool>
+                          <string name="proxy-Tab label">"General"</string>
+                          <string name="proxy-Tab icon">""</string>
                           <document>
                             <string name="title">"wxBoxSizer V"</string>
                             <string name="type">"dialog-control-document"</string>
@@ -90829,8 +90757,6 @@ It hands control over to another Dialog depending on the answer."</string>
                           <string name="proxy-Implementation filename">""</string>
                           <string name="proxy-Header filename">""</string>
                           <string name="proxy-Member variable name">""</string>
-                          <string name="proxy-Tab label">"Storage"</string>
-                          <string name="proxy-Tab icon">""</string>
                           <long name="proxy-PPU X">1</long>
                           <long name="proxy-PPU Y">1</long>
                           <long name="proxy-Units X">0</long>
@@ -90877,6 +90803,8 @@ It hands control over to another Dialog depending on the answer."</string>
                           <string name="proxy-Custom arguments">""</string>
                           <string name="proxy-Custom ctor arguments">""</string>
                           <bool name="proxy-AUI manager">0</bool>
+                          <string name="proxy-Tab label">"Storage"</string>
+                          <string name="proxy-Tab icon">""</string>
                           <document>
                             <string name="title">"wxBoxSizer V"</string>
                             <string name="type">"dialog-control-document"</string>
@@ -92542,8 +92470,6 @@ It hands control over to another Dialog depending on the answer."</string>
                           <string name="proxy-Implementation filename">""</string>
                           <string name="proxy-Header filename">""</string>
                           <string name="proxy-Member variable name">""</string>
-                          <string name="proxy-Tab label">"Status"</string>
-                          <string name="proxy-Tab icon">""</string>
                           <long name="proxy-PPU X">1</long>
                           <long name="proxy-PPU Y">1</long>
                           <long name="proxy-Units X">0</long>
@@ -92590,6 +92516,8 @@ It hands control over to another Dialog depending on the answer."</string>
                           <string name="proxy-Custom arguments">""</string>
                           <string name="proxy-Custom ctor arguments">""</string>
                           <bool name="proxy-AUI manager">0</bool>
+                          <string name="proxy-Tab label">"Status"</string>
+                          <string name="proxy-Tab icon">""</string>
                           <document>
                             <string name="title">"wxBoxSizer V"</string>
                             <string name="type">"dialog-control-document"</string>
@@ -92731,8 +92659,6 @@ It hands control over to another Dialog depending on the answer."</string>
                           <string name="proxy-Implementation filename">""</string>
                           <string name="proxy-Header filename">""</string>
                           <string name="proxy-Member variable name">""</string>
-                          <string name="proxy-Tab label">"Orig Status"</string>
-                          <string name="proxy-Tab icon">""</string>
                           <long name="proxy-PPU X">1</long>
                           <long name="proxy-PPU Y">1</long>
                           <long name="proxy-Units X">0</long>
@@ -92779,6 +92705,8 @@ It hands control over to another Dialog depending on the answer."</string>
                           <string name="proxy-Custom arguments">""</string>
                           <string name="proxy-Custom ctor arguments">""</string>
                           <bool name="proxy-AUI manager">0</bool>
+                          <string name="proxy-Tab label">"Orig Status"</string>
+                          <string name="proxy-Tab icon">""</string>
                           <document>
                             <string name="title">"wxBoxSizer V"</string>
                             <string name="type">"dialog-control-document"</string>
@@ -95533,8 +95461,6 @@ It hands control over to another Dialog depending on the answer."</string>
                           <string name="proxy-Implementation filename">""</string>
                           <string name="proxy-Header filename">""</string>
                           <string name="proxy-Member variable name">""</string>
-                          <string name="proxy-Tab label">"Stats"</string>
-                          <string name="proxy-Tab icon">""</string>
                           <long name="proxy-PPU X">1</long>
                           <long name="proxy-PPU Y">1</long>
                           <long name="proxy-Units X">0</long>
@@ -95581,6 +95507,8 @@ It hands control over to another Dialog depending on the answer."</string>
                           <string name="proxy-Custom arguments">""</string>
                           <string name="proxy-Custom ctor arguments">""</string>
                           <bool name="proxy-AUI manager">0</bool>
+                          <string name="proxy-Tab label">"Stats"</string>
+                          <string name="proxy-Tab icon">""</string>
                           <document>
                             <string name="title">"wxBoxSizer V"</string>
                             <string name="type">"dialog-control-document"</string>
@@ -97908,8 +97836,6 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-Tab label">"Types"</string>
-                    <string name="proxy-Tab icon">""</string>
                     <long name="proxy-PPU X">1</long>
                     <long name="proxy-PPU Y">1</long>
                     <long name="proxy-Units X">0</long>
@@ -97956,6 +97882,8 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Custom arguments">""</string>
                     <string name="proxy-Custom ctor arguments">""</string>
                     <bool name="proxy-AUI manager">0</bool>
+                    <string name="proxy-Tab label">"Types"</string>
+                    <string name="proxy-Tab icon">""</string>
                     <document>
                       <string name="title">"wxBoxSizer V"</string>
                       <string name="type">"dialog-control-document"</string>
@@ -98265,8 +98193,6 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-Tab label">"Initial"</string>
-                    <string name="proxy-Tab icon">""</string>
                     <long name="proxy-PPU X">1</long>
                     <long name="proxy-PPU Y">1</long>
                     <long name="proxy-Units X">0</long>
@@ -98313,6 +98239,8 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Custom arguments">""</string>
                     <string name="proxy-Custom ctor arguments">""</string>
                     <bool name="proxy-AUI manager">0</bool>
+                    <string name="proxy-Tab label">"Initial"</string>
+                    <string name="proxy-Tab icon">""</string>
                     <document>
                       <string name="title">"wxBoxSizer V"</string>
                       <string name="type">"dialog-control-document"</string>
@@ -99371,8 +99299,6 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-Tab label">"Dialogs"</string>
-                    <string name="proxy-Tab icon">""</string>
                     <long name="proxy-PPU X">1</long>
                     <long name="proxy-PPU Y">1</long>
                     <long name="proxy-Units X">0</long>
@@ -99419,6 +99345,8 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Custom arguments">""</string>
                     <string name="proxy-Custom ctor arguments">""</string>
                     <bool name="proxy-AUI manager">0</bool>
+                    <string name="proxy-Tab label">"Dialogs"</string>
+                    <string name="proxy-Tab icon">""</string>
                     <document>
                       <string name="title">"wxBoxSizer V"</string>
                       <string name="type">"dialog-control-document"</string>
@@ -99560,8 +99488,6 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-Tab label">"Coin Lists"</string>
-                    <string name="proxy-Tab icon">""</string>
                     <long name="proxy-PPU X">1</long>
                     <long name="proxy-PPU Y">1</long>
                     <long name="proxy-Units X">0</long>
@@ -99608,6 +99534,8 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Custom arguments">""</string>
                     <string name="proxy-Custom ctor arguments">""</string>
                     <bool name="proxy-AUI manager">0</bool>
+                    <string name="proxy-Tab label">"Coin Lists"</string>
+                    <string name="proxy-Tab icon">""</string>
                     <document>
                       <string name="title">"wxBoxSizer V"</string>
                       <string name="type">"dialog-control-document"</string>
@@ -99749,8 +99677,6 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-Tab label">"Badges"</string>
-                    <string name="proxy-Tab icon">""</string>
                     <long name="proxy-PPU X">1</long>
                     <long name="proxy-PPU Y">1</long>
                     <long name="proxy-Units X">0</long>
@@ -99797,6 +99723,8 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Custom arguments">""</string>
                     <string name="proxy-Custom ctor arguments">""</string>
                     <bool name="proxy-AUI manager">0</bool>
+                    <string name="proxy-Tab label">"Badges"</string>
+                    <string name="proxy-Tab icon">""</string>
                     <document>
                       <string name="title">"wxBoxSizer V"</string>
                       <string name="type">"dialog-control-document"</string>
@@ -99938,8 +99866,6 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-Tab label">"Abilities"</string>
-                    <string name="proxy-Tab icon">""</string>
                     <long name="proxy-PPU X">1</long>
                     <long name="proxy-PPU Y">1</long>
                     <long name="proxy-Units X">0</long>
@@ -99986,6 +99912,8 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Custom arguments">""</string>
                     <string name="proxy-Custom ctor arguments">""</string>
                     <bool name="proxy-AUI manager">0</bool>
+                    <string name="proxy-Tab label">"Abilities"</string>
+                    <string name="proxy-Tab icon">""</string>
                     <document>
                       <string name="title">"wxBoxSizer V"</string>
                       <string name="type">"dialog-control-document"</string>
@@ -100131,8 +100059,6 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-Tab label">"Natures"</string>
-                    <string name="proxy-Tab icon">""</string>
                     <long name="proxy-PPU X">1</long>
                     <long name="proxy-PPU Y">1</long>
                     <long name="proxy-Units X">0</long>
@@ -100179,6 +100105,8 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Custom arguments">""</string>
                     <string name="proxy-Custom ctor arguments">""</string>
                     <bool name="proxy-AUI manager">0</bool>
+                    <string name="proxy-Tab label">"Natures"</string>
+                    <string name="proxy-Tab icon">""</string>
                     <document>
                       <string name="title">"wxBoxSizer V"</string>
                       <string name="type">"dialog-control-document"</string>
@@ -100324,8 +100252,6 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-Tab label">"Skins"</string>
-                    <string name="proxy-Tab icon">""</string>
                     <long name="proxy-PPU X">1</long>
                     <long name="proxy-PPU Y">1</long>
                     <long name="proxy-Units X">0</long>
@@ -100372,6 +100298,8 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Custom arguments">""</string>
                     <string name="proxy-Custom ctor arguments">""</string>
                     <bool name="proxy-AUI manager">0</bool>
+                    <string name="proxy-Tab label">"Skins"</string>
+                    <string name="proxy-Tab icon">""</string>
                     <document>
                       <string name="title">"wxBoxSizer V"</string>
                       <string name="type">"dialog-control-document"</string>
@@ -101325,8 +101253,6 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-Tab label">"Egg Groups"</string>
-                    <string name="proxy-Tab icon">""</string>
                     <long name="proxy-PPU X">1</long>
                     <long name="proxy-PPU Y">1</long>
                     <long name="proxy-Units X">0</long>
@@ -101373,6 +101299,8 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Custom arguments">""</string>
                     <string name="proxy-Custom ctor arguments">""</string>
                     <bool name="proxy-AUI manager">0</bool>
+                    <string name="proxy-Tab label">"Egg Groups"</string>
+                    <string name="proxy-Tab icon">""</string>
                     <document>
                       <string name="title">"wxBoxSizer V"</string>
                       <string name="type">"dialog-control-document"</string>
@@ -101514,8 +101442,6 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Implementation filename">""</string>
                     <string name="proxy-Header filename">""</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-Tab label">"Miscellaneous"</string>
-                    <string name="proxy-Tab icon">""</string>
                     <long name="proxy-PPU X">1</long>
                     <long name="proxy-PPU Y">1</long>
                     <long name="proxy-Units X">0</long>
@@ -101562,6 +101488,8 @@ It hands control over to another Dialog depending on the answer."</string>
                     <string name="proxy-Custom arguments">""</string>
                     <string name="proxy-Custom ctor arguments">""</string>
                     <bool name="proxy-AUI manager">0</bool>
+                    <string name="proxy-Tab label">"Miscellaneous"</string>
+                    <string name="proxy-Tab icon">""</string>
                     <document>
                       <string name="title">"wxBoxSizer V"</string>
                       <string name="type">"dialog-control-document"</string>
@@ -102433,8 +102361,6 @@ It hands control over to another Dialog depending on the answer."</string>
               <string name="proxy-Implementation filename">""</string>
               <string name="proxy-Header filename">""</string>
               <string name="proxy-Member variable name">""</string>
-              <string name="proxy-Tab label">"Items"</string>
-              <string name="proxy-Tab icon">""</string>
               <long name="proxy-PPU X">1</long>
               <long name="proxy-PPU Y">1</long>
               <long name="proxy-Units X">0</long>
@@ -102481,6 +102407,8 @@ It hands control over to another Dialog depending on the answer."</string>
               <string name="proxy-Custom arguments">""</string>
               <string name="proxy-Custom ctor arguments">""</string>
               <bool name="proxy-AUI manager">0</bool>
+              <string name="proxy-Tab label">"Items"</string>
+              <string name="proxy-Tab icon">""</string>
               <document>
                 <string name="title">"wxBoxSizer V"</string>
                 <string name="type">"dialog-control-document"</string>
@@ -102622,8 +102550,6 @@ It hands control over to another Dialog depending on the answer."</string>
               <string name="proxy-Implementation filename">""</string>
               <string name="proxy-Header filename">""</string>
               <string name="proxy-Member variable name">""</string>
-              <string name="proxy-Tab label">"Map"</string>
-              <string name="proxy-Tab icon">""</string>
               <long name="proxy-PPU X">1</long>
               <long name="proxy-PPU Y">1</long>
               <long name="proxy-Units X">0</long>
@@ -102670,6 +102596,8 @@ It hands control over to another Dialog depending on the answer."</string>
               <string name="proxy-Custom arguments">""</string>
               <string name="proxy-Custom ctor arguments">""</string>
               <bool name="proxy-AUI manager">0</bool>
+              <string name="proxy-Tab label">"Map"</string>
+              <string name="proxy-Tab icon">""</string>
               <document>
                 <string name="title">"wxBoxSizer V"</string>
                 <string name="type">"dialog-control-document"</string>
@@ -102811,8 +102739,6 @@ It hands control over to another Dialog depending on the answer."</string>
               <string name="proxy-Implementation filename">""</string>
               <string name="proxy-Header filename">""</string>
               <string name="proxy-Member variable name">""</string>
-              <string name="proxy-Tab label">"Moves"</string>
-              <string name="proxy-Tab icon">""</string>
               <long name="proxy-PPU X">1</long>
               <long name="proxy-PPU Y">1</long>
               <long name="proxy-Units X">0</long>
@@ -102859,6 +102785,8 @@ It hands control over to another Dialog depending on the answer."</string>
               <string name="proxy-Custom arguments">""</string>
               <string name="proxy-Custom ctor arguments">""</string>
               <bool name="proxy-AUI manager">0</bool>
+              <string name="proxy-Tab label">"Moves"</string>
+              <string name="proxy-Tab icon">""</string>
               <document>
                 <string name="title">"wxBoxSizer V"</string>
                 <string name="type">"dialog-control-document"</string>
@@ -103000,8 +102928,6 @@ It hands control over to another Dialog depending on the answer."</string>
               <string name="proxy-Implementation filename">""</string>
               <string name="proxy-Header filename">""</string>
               <string name="proxy-Member variable name">""</string>
-              <string name="proxy-Tab label">"Pokémon"</string>
-              <string name="proxy-Tab icon">""</string>
               <long name="proxy-PPU X">1</long>
               <long name="proxy-PPU Y">1</long>
               <long name="proxy-Units X">0</long>
@@ -103048,6 +102974,8 @@ It hands control over to another Dialog depending on the answer."</string>
               <string name="proxy-Custom arguments">""</string>
               <string name="proxy-Custom ctor arguments">""</string>
               <bool name="proxy-AUI manager">0</bool>
+              <string name="proxy-Tab label">"Pokémon"</string>
+              <string name="proxy-Tab icon">""</string>
               <document>
                 <string name="title">"wxBoxSizer V"</string>
                 <string name="type">"dialog-control-document"</string>
@@ -103189,8 +103117,6 @@ It hands control over to another Dialog depending on the answer."</string>
               <string name="proxy-Implementation filename">""</string>
               <string name="proxy-Header filename">""</string>
               <string name="proxy-Member variable name">""</string>
-              <string name="proxy-Tab label">"Stores"</string>
-              <string name="proxy-Tab icon">""</string>
               <long name="proxy-PPU X">1</long>
               <long name="proxy-PPU Y">1</long>
               <long name="proxy-Units X">0</long>
@@ -103237,6 +103163,8 @@ It hands control over to another Dialog depending on the answer."</string>
               <string name="proxy-Custom arguments">""</string>
               <string name="proxy-Custom ctor arguments">""</string>
               <bool name="proxy-AUI manager">0</bool>
+              <string name="proxy-Tab label">"Stores"</string>
+              <string name="proxy-Tab icon">""</string>
               <document>
                 <string name="title">"wxBoxSizer V"</string>
                 <string name="type">"dialog-control-document"</string>
@@ -103378,8 +103306,6 @@ It hands control over to another Dialog depending on the answer."</string>
               <string name="proxy-Implementation filename">""</string>
               <string name="proxy-Header filename">""</string>
               <string name="proxy-Member variable name">""</string>
-              <string name="proxy-Tab label">"Tiles"</string>
-              <string name="proxy-Tab icon">""</string>
               <long name="proxy-PPU X">1</long>
               <long name="proxy-PPU Y">1</long>
               <long name="proxy-Units X">0</long>
@@ -103426,6 +103352,8 @@ It hands control over to another Dialog depending on the answer."</string>
               <string name="proxy-Custom arguments">""</string>
               <string name="proxy-Custom ctor arguments">""</string>
               <bool name="proxy-AUI manager">0</bool>
+              <string name="proxy-Tab label">"Tiles"</string>
+              <string name="proxy-Tab icon">""</string>
               <document>
                 <string name="title">"wxBoxSizer V"</string>
                 <string name="type">"dialog-control-document"</string>
diff --git a/pokemodr/gui/dlgCheckLevels.cpp b/pokemodr/gui/dlgCheckLevels.cpp
index 59d81173..93302435 100644
--- a/pokemodr/gui/dlgCheckLevels.cpp
+++ b/pokemodr/gui/dlgCheckLevels.cpp
@@ -58,7 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS( CheckLevelsDialog, wxDialog )
 BEGIN_EVENT_TABLE( CheckLevelsDialog, wxDialog )
 
 ////@begin CheckLevelsDialog event table entries
-	EVT_INIT_DIALOG( CheckLevelsDialog::OnInitDialog )
+   EVT_INIT_DIALOG( CheckLevelsDialog::OnInitDialog )
 
 ////@end CheckLevelsDialog event table entries
 
@@ -86,14 +86,14 @@ CheckLevelsDialog::CheckLevelsDialog( wxWindow* parent, wxWindowID id, const wxS
 bool CheckLevelsDialog::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
 ////@begin CheckLevelsDialog creation
-	wxDialog::Create( parent, id, caption, pos, size, style );
-
-	CreateControls();
-	if (GetSizer())
-	{
-		GetSizer()->SetSizeHints(this);
-	}
-	Centre();
+   wxDialog::Create( parent, id, caption, pos, size, style );
+
+   CreateControls();
+   if (GetSizer())
+   {
+      GetSizer()->SetSizeHints(this);
+   }
+   Centre();
 ////@end CheckLevelsDialog creation
 	return true;
 }
@@ -115,11 +115,11 @@ CheckLevelsDialog::~CheckLevelsDialog()
 void CheckLevelsDialog::Init()
 {
 ////@begin CheckLevelsDialog member initialisation
-	m_Compare = NULL;
-	m_Level = NULL;
-	m_True = NULL;
-	m_False = NULL;
-	m_Mode = NULL;
+   m_Compare = NULL;
+   m_Level = NULL;
+   m_True = NULL;
+   m_False = NULL;
+   m_Mode = NULL;
 ////@end CheckLevelsDialog member initialisation
 }
 /*!
@@ -129,92 +129,92 @@ void CheckLevelsDialog::Init()
 void CheckLevelsDialog::CreateControls()
 {    
 ////@begin CheckLevelsDialog content construction
-	CheckLevelsDialog* itemDialog1 = this;
+   CheckLevelsDialog* itemDialog1 = this;
 
-	wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
-	itemDialog1->SetSizer(itemBoxSizer2);
+   wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
+   itemDialog1->SetSizer(itemBoxSizer2);
 
-	wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("Checks the levels of the roster currently\nbeing carried and hands control over to\nanother dialog depending on its truth"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL|wxADJUST_MINSIZE, 0);
+   wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("Checks the levels of the roster currently\nbeing carried and hands control over to\nanother dialog depending on its truth"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+   itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL, 0);
 
-	wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer4, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer4, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("Constraints:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("Constraints:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString m_CompareStrings[] = {
-		_("><")
-	};
-	m_Compare = new wxComboBox( itemDialog1, ID_COMPARE, _("="), wxDefaultPosition, wxDefaultSize, 1, m_CompareStrings, wxCB_DROPDOWN );
-	m_Compare->SetStringSelection(_("="));
-	itemStaticBoxSizer4->Add(m_Compare, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_CompareStrings;
+   m_CompareStrings.Add(_("="));
+   m_CompareStrings.Add(_(">"));
+   m_CompareStrings.Add(_("<"));
+   m_Compare = new wxComboBox( itemDialog1, ID_COMPARE, _("="), wxDefaultPosition, wxDefaultSize, m_CompareStrings, wxCB_DROPDOWN );
+   m_Compare->SetStringSelection(_("="));
+   itemStaticBoxSizer4->Add(m_Compare, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	m_Level = new wxSpinCtrl( itemDialog1, ID_NUMBER, _T("0"), wxDefaultPosition, wxSize(90, 20), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 0, 0 );
-	itemStaticBoxSizer4->Add(m_Level, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   m_Level = new wxSpinCtrl( itemDialog1, ID_NUMBER, _T("0"), wxDefaultPosition, wxSize(90, 20), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 0, 0 );
+   itemStaticBoxSizer4->Add(m_Level, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStaticBox* itemStaticBoxSizer9Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer9 = new wxStaticBoxSizer(itemStaticBoxSizer9Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer9, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer9Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer9 = new wxStaticBoxSizer(itemStaticBoxSizer9Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer9, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText10 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Meets:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer9->Add(itemStaticText10, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText10 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Meets:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer9->Add(itemStaticText10, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer9->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer9->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString* m_TrueStrings = NULL;
-	m_True = new wxComboBox( itemDialog1, ID_MEETS, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_TrueStrings, wxCB_READONLY|wxCB_SORT );
-	if (ShowToolTips())
-		m_True->SetToolTip(_("The Dialog to hand control over to if the Levels meet the constraints"));
-	itemStaticBoxSizer9->Add(m_True, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_TrueStrings;
+   m_True = new wxComboBox( itemDialog1, ID_MEETS, _T(""), wxDefaultPosition, wxDefaultSize, m_TrueStrings, wxCB_READONLY|wxCB_SORT );
+   if (ShowToolTips())
+      m_True->SetToolTip(_("The Dialog to hand control over to if the Levels meet the constraints"));
+   itemStaticBoxSizer9->Add(m_True, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStaticBox* itemStaticBoxSizer13Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer13 = new wxStaticBoxSizer(itemStaticBoxSizer13Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer13, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer13Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer13 = new wxStaticBoxSizer(itemStaticBoxSizer13Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer13, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText14 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Doesn't Meet:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer13->Add(itemStaticText14, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText14 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Doesn't Meet:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer13->Add(itemStaticText14, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer13->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer13->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString* m_FalseStrings = NULL;
-	m_False = new wxComboBox( itemDialog1, ID_DOESNT_MEET, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_FalseStrings, wxCB_READONLY|wxCB_SORT );
-	if (ShowToolTips())
-		m_False->SetToolTip(_("The Dialog to hand control over to if the Levels don't meet the requirements"));
-	itemStaticBoxSizer13->Add(m_False, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_FalseStrings;
+   m_False = new wxComboBox( itemDialog1, ID_DOESNT_MEET, _T(""), wxDefaultPosition, wxDefaultSize, m_FalseStrings, wxCB_READONLY|wxCB_SORT );
+   if (ShowToolTips())
+      m_False->SetToolTip(_("The Dialog to hand control over to if the Levels don't meet the requirements"));
+   itemStaticBoxSizer13->Add(m_False, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStaticBox* itemStaticBoxSizer17Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer17 = new wxStaticBoxSizer(itemStaticBoxSizer17Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer17, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer17Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer17 = new wxStaticBoxSizer(itemStaticBoxSizer17Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer17, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Mode:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer17->Add(itemStaticText18, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Mode:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer17->Add(itemStaticText18, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer17->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer17->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString m_ModeStrings[] = {
-		_("Call"),
-		_("Goto")
-	};
-	m_Mode = new wxComboBox( itemDialog1, ID_MODE, _("Call"), wxDefaultPosition, wxDefaultSize, 2, m_ModeStrings, wxCB_READONLY );
-	m_Mode->SetStringSelection(_("Call"));
-	if (ShowToolTips())
-		m_Mode->SetToolTip(_("Call-Returns when other Dialog is complete\n\nGoto-Exits all Dialogs once complete"));
-	itemStaticBoxSizer17->Add(m_Mode, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_ModeStrings;
+   m_ModeStrings.Add(_("Call"));
+   m_ModeStrings.Add(_("Goto"));
+   m_Mode = new wxComboBox( itemDialog1, ID_MODE, _("Call"), wxDefaultPosition, wxDefaultSize, m_ModeStrings, wxCB_READONLY );
+   m_Mode->SetStringSelection(_("Call"));
+   if (ShowToolTips())
+      m_Mode->SetToolTip(_("Call-Returns when other Dialog is complete\n\nGoto-Exits all Dialogs once complete"));
+   itemStaticBoxSizer17->Add(m_Mode, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStdDialogButtonSizer* itemStdDialogButtonSizer21 = new wxStdDialogButtonSizer;
+   wxStdDialogButtonSizer* itemStdDialogButtonSizer21 = new wxStdDialogButtonSizer;
 
-	itemBoxSizer2->Add(itemStdDialogButtonSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
-	wxButton* itemButton22 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStdDialogButtonSizer21->AddButton(itemButton22);
+   itemBoxSizer2->Add(itemStdDialogButtonSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+   wxButton* itemButton22 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStdDialogButtonSizer21->AddButton(itemButton22);
 
-	wxButton* itemButton23 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStdDialogButtonSizer21->AddButton(itemButton23);
+   wxButton* itemButton23 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStdDialogButtonSizer21->AddButton(itemButton23);
 
-	itemStdDialogButtonSizer21->Realize();
+   itemStdDialogButtonSizer21->Realize();
 
 ////@end CheckLevelsDialog content construction
 }
@@ -226,8 +226,8 @@ void CheckLevelsDialog::CreateControls()
 void CheckLevelsDialog::OnInitDialog( wxInitDialogEvent& event )
 {
 ////@begin wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_LEVELS in CheckLevelsDialog.
-	// Before editing this code, remove the block markers.
-	event.Skip();
+   // Before editing this code, remove the block markers.
+   event.Skip();
 ////@end wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_LEVELS in CheckLevelsDialog. 
 }
 
@@ -248,8 +248,8 @@ wxBitmap CheckLevelsDialog::GetBitmapResource( const wxString& name )
 {
 	// Bitmap retrieval
 ////@begin CheckLevelsDialog bitmap retrieval
-	wxUnusedVar(name);
-	return wxNullBitmap;
+   wxUnusedVar(name);
+   return wxNullBitmap;
 ////@end CheckLevelsDialog bitmap retrieval
 }
 
@@ -261,7 +261,7 @@ wxIcon CheckLevelsDialog::GetIconResource( const wxString& name )
 {
 	// Icon retrieval
 ////@begin CheckLevelsDialog icon retrieval
-	wxUnusedVar(name);
-	return wxNullIcon;
+   wxUnusedVar(name);
+   return wxNullIcon;
 ////@end CheckLevelsDialog icon retrieval
 }
diff --git a/pokemodr/gui/dlgCheckLevels.h b/pokemodr/gui/dlgCheckLevels.h
index d72d2cdd..e9639563 100644
--- a/pokemodr/gui/dlgCheckLevels.h
+++ b/pokemodr/gui/dlgCheckLevels.h
@@ -93,38 +93,38 @@ public:
 
 ////@begin CheckLevelsDialog event handler declarations
 
-	/// wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_LEVELS
-	void OnInitDialog( wxInitDialogEvent& event );
+   /// wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_LEVELS
+   void OnInitDialog( wxInitDialogEvent& event );
 
 ////@end CheckLevelsDialog event handler declarations
 
 ////@begin CheckLevelsDialog member function declarations
 
-	/// Retrieves bitmap resources
-	wxBitmap GetBitmapResource( const wxString& name );
+   /// Retrieves bitmap resources
+   wxBitmap GetBitmapResource( const wxString& name );
 
-	/// Retrieves icon resources
-	wxIcon GetIconResource( const wxString& name );
+   /// Retrieves icon resources
+   wxIcon GetIconResource( const wxString& name );
 ////@end CheckLevelsDialog member function declarations
 
 	/// Should we show tooltips?
 	static bool ShowToolTips();
 
 ////@begin CheckLevelsDialog member variables
-	wxComboBox* m_Compare;
-	wxSpinCtrl* m_Level;
-	wxComboBox* m_True;
-	wxComboBox* m_False;
-	wxComboBox* m_Mode;
-	/// Control identifiers
-	enum {
-		ID_DLG_CHECK_LEVELS = 10231,
-		ID_COMPARE = 10235,
-		ID_NUMBER = 10236,
-		ID_MEETS = 10238,
-		ID_DOESNT_MEET = 10240,
-		ID_MODE = 10242
-	};
+   wxComboBox* m_Compare;
+   wxSpinCtrl* m_Level;
+   wxComboBox* m_True;
+   wxComboBox* m_False;
+   wxComboBox* m_Mode;
+   /// Control identifiers
+   enum {
+      ID_DLG_CHECK_LEVELS = 10231,
+      ID_COMPARE = 10235,
+      ID_NUMBER = 10236,
+      ID_MEETS = 10238,
+      ID_DOESNT_MEET = 10240,
+      ID_MODE = 10242
+   };
 ////@end CheckLevelsDialog member variables
 };
 
diff --git a/pokemodr/gui/dlgCheckMoney.cpp b/pokemodr/gui/dlgCheckMoney.cpp
index 6a85f8ed..8c508648 100644
--- a/pokemodr/gui/dlgCheckMoney.cpp
+++ b/pokemodr/gui/dlgCheckMoney.cpp
@@ -58,7 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS( CheckMoneyDialog, wxDialog )
 BEGIN_EVENT_TABLE( CheckMoneyDialog, wxDialog )
 
 ////@begin CheckMoneyDialog event table entries
-	EVT_INIT_DIALOG( CheckMoneyDialog::OnInitDialog )
+   EVT_INIT_DIALOG( CheckMoneyDialog::OnInitDialog )
 
 ////@end CheckMoneyDialog event table entries
 
@@ -86,14 +86,14 @@ CheckMoneyDialog::CheckMoneyDialog( wxWindow* parent, wxWindowID id, const wxStr
 bool CheckMoneyDialog::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
 ////@begin CheckMoneyDialog creation
-	wxDialog::Create( parent, id, caption, pos, size, style );
-
-	CreateControls();
-	if (GetSizer())
-	{
-		GetSizer()->SetSizeHints(this);
-	}
-	Centre();
+   wxDialog::Create( parent, id, caption, pos, size, style );
+
+   CreateControls();
+   if (GetSizer())
+   {
+      GetSizer()->SetSizeHints(this);
+   }
+   Centre();
 ////@end CheckMoneyDialog creation
 	return true;
 }
@@ -115,11 +115,11 @@ CheckMoneyDialog::~CheckMoneyDialog()
 void CheckMoneyDialog::Init()
 {
 ////@begin CheckMoneyDialog member initialisation
-	m_Compare = NULL;
-	m_Money = NULL;
-	m_True = NULL;
-	m_False = NULL;
-	m_Mode = NULL;
+   m_Compare = NULL;
+   m_Money = NULL;
+   m_True = NULL;
+   m_False = NULL;
+   m_Mode = NULL;
 ////@end CheckMoneyDialog member initialisation
 }
 /*!
@@ -129,92 +129,92 @@ void CheckMoneyDialog::Init()
 void CheckMoneyDialog::CreateControls()
 {    
 ////@begin CheckMoneyDialog content construction
-	CheckMoneyDialog* itemDialog1 = this;
+   CheckMoneyDialog* itemDialog1 = this;
 
-	wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
-	itemDialog1->SetSizer(itemBoxSizer2);
+   wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
+   itemDialog1->SetSizer(itemBoxSizer2);
 
-	wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("Checks the Player for Money"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL|wxADJUST_MINSIZE, 0);
+   wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("Checks the Player for Money"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+   itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL, 0);
 
-	wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer4, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer4, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("Constraints:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("Constraints:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString m_CompareStrings[] = {
-		_("><")
-	};
-	m_Compare = new wxComboBox( itemDialog1, ID_COMPARE, _("="), wxDefaultPosition, wxDefaultSize, 1, m_CompareStrings, wxCB_READONLY );
-	m_Compare->SetStringSelection(_("="));
-	itemStaticBoxSizer4->Add(m_Compare, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_CompareStrings;
+   m_CompareStrings.Add(_("="));
+   m_CompareStrings.Add(_(">"));
+   m_CompareStrings.Add(_("<"));
+   m_Compare = new wxComboBox( itemDialog1, ID_COMPARE, _("="), wxDefaultPosition, wxDefaultSize, m_CompareStrings, wxCB_READONLY );
+   m_Compare->SetStringSelection(_("="));
+   itemStaticBoxSizer4->Add(m_Compare, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	m_Money = new wxSpinCtrl( itemDialog1, ID_NUMBER, _T("0"), wxDefaultPosition, wxSize(90, 20), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 0, 0 );
-	itemStaticBoxSizer4->Add(m_Money, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   m_Money = new wxSpinCtrl( itemDialog1, ID_NUMBER, _T("0"), wxDefaultPosition, wxSize(90, 20), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 0, 0 );
+   itemStaticBoxSizer4->Add(m_Money, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStaticBox* itemStaticBoxSizer9Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer9 = new wxStaticBoxSizer(itemStaticBoxSizer9Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer9, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer9Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer9 = new wxStaticBoxSizer(itemStaticBoxSizer9Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer9, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText10 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Meets:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer9->Add(itemStaticText10, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText10 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Meets:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer9->Add(itemStaticText10, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer9->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer9->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString* m_TrueStrings = NULL;
-	m_True = new wxComboBox( itemDialog1, ID_MEETS, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_TrueStrings, wxCB_READONLY|wxCB_SORT );
-	if (ShowToolTips())
-		m_True->SetToolTip(_("The Dialog to hand control over to if the Money amount meets the constraints"));
-	itemStaticBoxSizer9->Add(m_True, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_TrueStrings;
+   m_True = new wxComboBox( itemDialog1, ID_MEETS, _T(""), wxDefaultPosition, wxDefaultSize, m_TrueStrings, wxCB_READONLY|wxCB_SORT );
+   if (ShowToolTips())
+      m_True->SetToolTip(_("The Dialog to hand control over to if the Money amount meets the constraints"));
+   itemStaticBoxSizer9->Add(m_True, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStaticBox* itemStaticBoxSizer13Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer13 = new wxStaticBoxSizer(itemStaticBoxSizer13Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer13, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer13Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer13 = new wxStaticBoxSizer(itemStaticBoxSizer13Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer13, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText14 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Doesn't Meet:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer13->Add(itemStaticText14, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText14 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Doesn't Meet:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer13->Add(itemStaticText14, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer13->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer13->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString* m_FalseStrings = NULL;
-	m_False = new wxComboBox( itemDialog1, ID_DOESNT_MEET, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_FalseStrings, wxCB_READONLY|wxCB_SORT );
-	if (ShowToolTips())
-		m_False->SetToolTip(_("The Dialog to hand control over to if the Money amount doesn't meet the requirements"));
-	itemStaticBoxSizer13->Add(m_False, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_FalseStrings;
+   m_False = new wxComboBox( itemDialog1, ID_DOESNT_MEET, _T(""), wxDefaultPosition, wxDefaultSize, m_FalseStrings, wxCB_READONLY|wxCB_SORT );
+   if (ShowToolTips())
+      m_False->SetToolTip(_("The Dialog to hand control over to if the Money amount doesn't meet the requirements"));
+   itemStaticBoxSizer13->Add(m_False, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStaticBox* itemStaticBoxSizer17Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer17 = new wxStaticBoxSizer(itemStaticBoxSizer17Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer17, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer17Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer17 = new wxStaticBoxSizer(itemStaticBoxSizer17Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer17, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Mode:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer17->Add(itemStaticText18, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Mode:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer17->Add(itemStaticText18, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer17->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer17->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString m_ModeStrings[] = {
-		_("Call"),
-		_("Goto")
-	};
-	m_Mode = new wxComboBox( itemDialog1, ID_MODE, _("Call"), wxDefaultPosition, wxDefaultSize, 2, m_ModeStrings, wxCB_READONLY );
-	m_Mode->SetStringSelection(_("Call"));
-	if (ShowToolTips())
-		m_Mode->SetToolTip(_("Call-Returns when other Dialog is complete\n\nGoto-Exits all Dialogs once complete"));
-	itemStaticBoxSizer17->Add(m_Mode, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_ModeStrings;
+   m_ModeStrings.Add(_("Call"));
+   m_ModeStrings.Add(_("Goto"));
+   m_Mode = new wxComboBox( itemDialog1, ID_MODE, _("Call"), wxDefaultPosition, wxDefaultSize, m_ModeStrings, wxCB_READONLY );
+   m_Mode->SetStringSelection(_("Call"));
+   if (ShowToolTips())
+      m_Mode->SetToolTip(_("Call-Returns when other Dialog is complete\n\nGoto-Exits all Dialogs once complete"));
+   itemStaticBoxSizer17->Add(m_Mode, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStdDialogButtonSizer* itemStdDialogButtonSizer21 = new wxStdDialogButtonSizer;
+   wxStdDialogButtonSizer* itemStdDialogButtonSizer21 = new wxStdDialogButtonSizer;
 
-	itemBoxSizer2->Add(itemStdDialogButtonSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
-	wxButton* itemButton22 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStdDialogButtonSizer21->AddButton(itemButton22);
+   itemBoxSizer2->Add(itemStdDialogButtonSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+   wxButton* itemButton22 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStdDialogButtonSizer21->AddButton(itemButton22);
 
-	wxButton* itemButton23 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStdDialogButtonSizer21->AddButton(itemButton23);
+   wxButton* itemButton23 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStdDialogButtonSizer21->AddButton(itemButton23);
 
-	itemStdDialogButtonSizer21->Realize();
+   itemStdDialogButtonSizer21->Realize();
 
 ////@end CheckMoneyDialog content construction
 }
@@ -226,8 +226,8 @@ void CheckMoneyDialog::CreateControls()
 void CheckMoneyDialog::OnInitDialog( wxInitDialogEvent& event )
 {
 ////@begin wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_MONEY in CheckMoneyDialog.
-	// Before editing this code, remove the block markers.
-	event.Skip();
+   // Before editing this code, remove the block markers.
+   event.Skip();
 ////@end wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_MONEY in CheckMoneyDialog. 
 }
 
@@ -248,8 +248,8 @@ wxBitmap CheckMoneyDialog::GetBitmapResource( const wxString& name )
 {
 	// Bitmap retrieval
 ////@begin CheckMoneyDialog bitmap retrieval
-	wxUnusedVar(name);
-	return wxNullBitmap;
+   wxUnusedVar(name);
+   return wxNullBitmap;
 ////@end CheckMoneyDialog bitmap retrieval
 }
 
@@ -261,7 +261,7 @@ wxIcon CheckMoneyDialog::GetIconResource( const wxString& name )
 {
 	// Icon retrieval
 ////@begin CheckMoneyDialog icon retrieval
-	wxUnusedVar(name);
-	return wxNullIcon;
+   wxUnusedVar(name);
+   return wxNullIcon;
 ////@end CheckMoneyDialog icon retrieval
 }
diff --git a/pokemodr/gui/dlgCheckMoney.h b/pokemodr/gui/dlgCheckMoney.h
index 99a56830..052d1963 100644
--- a/pokemodr/gui/dlgCheckMoney.h
+++ b/pokemodr/gui/dlgCheckMoney.h
@@ -93,38 +93,38 @@ public:
 
 ////@begin CheckMoneyDialog event handler declarations
 
-	/// wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_MONEY
-	void OnInitDialog( wxInitDialogEvent& event );
+   /// wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_MONEY
+   void OnInitDialog( wxInitDialogEvent& event );
 
 ////@end CheckMoneyDialog event handler declarations
 
 ////@begin CheckMoneyDialog member function declarations
 
-	/// Retrieves bitmap resources
-	wxBitmap GetBitmapResource( const wxString& name );
+   /// Retrieves bitmap resources
+   wxBitmap GetBitmapResource( const wxString& name );
 
-	/// Retrieves icon resources
-	wxIcon GetIconResource( const wxString& name );
+   /// Retrieves icon resources
+   wxIcon GetIconResource( const wxString& name );
 ////@end CheckMoneyDialog member function declarations
 
 	/// Should we show tooltips?
 	static bool ShowToolTips();
 
 ////@begin CheckMoneyDialog member variables
-	wxComboBox* m_Compare;
-	wxSpinCtrl* m_Money;
-	wxComboBox* m_True;
-	wxComboBox* m_False;
-	wxComboBox* m_Mode;
-	/// Control identifiers
-	enum {
-		ID_DLG_CHECK_MONEY = 10265,
-		ID_COMPARE = 10269,
-		ID_NUMBER = 10270,
-		ID_MEETS = 10272,
-		ID_DOESNT_MEET = 10274,
-		ID_MODE = 10276
-	};
+   wxComboBox* m_Compare;
+   wxSpinCtrl* m_Money;
+   wxComboBox* m_True;
+   wxComboBox* m_False;
+   wxComboBox* m_Mode;
+   /// Control identifiers
+   enum {
+      ID_DLG_CHECK_MONEY = 10265,
+      ID_COMPARE = 10269,
+      ID_NUMBER = 10270,
+      ID_MEETS = 10272,
+      ID_DOESNT_MEET = 10274,
+      ID_MODE = 10276
+   };
 ////@end CheckMoneyDialog member variables
 };
 
diff --git a/pokemodr/gui/dlgCheckRoster.cpp b/pokemodr/gui/dlgCheckRoster.cpp
index ac7a8096..a0c0740b 100644
--- a/pokemodr/gui/dlgCheckRoster.cpp
+++ b/pokemodr/gui/dlgCheckRoster.cpp
@@ -58,7 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS( CheckRosterDialog, wxDialog )
 BEGIN_EVENT_TABLE( CheckRosterDialog, wxDialog )
 
 ////@begin CheckRosterDialog event table entries
-	EVT_INIT_DIALOG( CheckRosterDialog::OnInitDialog )
+   EVT_INIT_DIALOG( CheckRosterDialog::OnInitDialog )
 
 ////@end CheckRosterDialog event table entries
 
@@ -86,14 +86,14 @@ CheckRosterDialog::CheckRosterDialog( wxWindow* parent, wxWindowID id, const wxS
 bool CheckRosterDialog::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
 ////@begin CheckRosterDialog creation
-	wxDialog::Create( parent, id, caption, pos, size, style );
-
-	CreateControls();
-	if (GetSizer())
-	{
-		GetSizer()->SetSizeHints(this);
-	}
-	Centre();
+   wxDialog::Create( parent, id, caption, pos, size, style );
+
+   CreateControls();
+   if (GetSizer())
+   {
+      GetSizer()->SetSizeHints(this);
+   }
+   Centre();
 ////@end CheckRosterDialog creation
 	return true;
 }
@@ -115,11 +115,11 @@ CheckRosterDialog::~CheckRosterDialog()
 void CheckRosterDialog::Init()
 {
 ////@begin CheckRosterDialog member initialisation
-	m_Compare = NULL;
-	m_RosterSize = NULL;
-	m_True = NULL;
-	m_False = NULL;
-	m_Mode = NULL;
+   m_Compare = NULL;
+   m_RosterSize = NULL;
+   m_True = NULL;
+   m_False = NULL;
+   m_Mode = NULL;
 ////@end CheckRosterDialog member initialisation
 }
 /*!
@@ -129,92 +129,92 @@ void CheckRosterDialog::Init()
 void CheckRosterDialog::CreateControls()
 {    
 ////@begin CheckRosterDialog content construction
-	CheckRosterDialog* itemDialog1 = this;
+   CheckRosterDialog* itemDialog1 = this;
 
-	wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
-	itemDialog1->SetSizer(itemBoxSizer2);
+   wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
+   itemDialog1->SetSizer(itemBoxSizer2);
 
-	wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("Checks the team size that the Player is carrying\nand hands control over to a Dialog depending\non whether it meets the requirements or not"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL|wxADJUST_MINSIZE, 0);
+   wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("Checks the team size that the Player is carrying\nand hands control over to a Dialog depending\non whether it meets the requirements or not"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+   itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL, 0);
 
-	wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer4, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer4, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("Constraints:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("Constraints:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString m_CompareStrings[] = {
-		_("><")
-	};
-	m_Compare = new wxComboBox( itemDialog1, ID_COMPARE, _("="), wxDefaultPosition, wxDefaultSize, 1, m_CompareStrings, wxCB_READONLY );
-	m_Compare->SetStringSelection(_("="));
-	itemStaticBoxSizer4->Add(m_Compare, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_CompareStrings;
+   m_CompareStrings.Add(_("="));
+   m_CompareStrings.Add(_(">"));
+   m_CompareStrings.Add(_("<"));
+   m_Compare = new wxComboBox( itemDialog1, ID_COMPARE, _("="), wxDefaultPosition, wxDefaultSize, m_CompareStrings, wxCB_READONLY );
+   m_Compare->SetStringSelection(_("="));
+   itemStaticBoxSizer4->Add(m_Compare, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	m_RosterSize = new wxSpinCtrl( itemDialog1, ID_NUMBER, _T("0"), wxDefaultPosition, wxSize(90, 20), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 0, 0 );
-	itemStaticBoxSizer4->Add(m_RosterSize, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   m_RosterSize = new wxSpinCtrl( itemDialog1, ID_NUMBER, _T("0"), wxDefaultPosition, wxSize(90, 20), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 0, 0 );
+   itemStaticBoxSizer4->Add(m_RosterSize, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStaticBox* itemStaticBoxSizer9Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer9 = new wxStaticBoxSizer(itemStaticBoxSizer9Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer9, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer9Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer9 = new wxStaticBoxSizer(itemStaticBoxSizer9Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer9, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText10 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Meets:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer9->Add(itemStaticText10, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText10 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Meets:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer9->Add(itemStaticText10, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer9->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer9->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString* m_TrueStrings = NULL;
-	m_True = new wxComboBox( itemDialog1, ID_MEETS, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_TrueStrings, wxCB_READONLY|wxCB_SORT );
-	if (ShowToolTips())
-		m_True->SetToolTip(_("The Dialog to hand control over to if the Roster meets the constraints"));
-	itemStaticBoxSizer9->Add(m_True, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_TrueStrings;
+   m_True = new wxComboBox( itemDialog1, ID_MEETS, _T(""), wxDefaultPosition, wxDefaultSize, m_TrueStrings, wxCB_READONLY|wxCB_SORT );
+   if (ShowToolTips())
+      m_True->SetToolTip(_("The Dialog to hand control over to if the Roster meets the constraints"));
+   itemStaticBoxSizer9->Add(m_True, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStaticBox* itemStaticBoxSizer13Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer13 = new wxStaticBoxSizer(itemStaticBoxSizer13Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer13, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer13Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer13 = new wxStaticBoxSizer(itemStaticBoxSizer13Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer13, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText14 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Doesn't Meet:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer13->Add(itemStaticText14, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText14 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Doesn't Meet:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer13->Add(itemStaticText14, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer13->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer13->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString* m_FalseStrings = NULL;
-	m_False = new wxComboBox( itemDialog1, ID_DOESNT_MEET, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_FalseStrings, wxCB_READONLY|wxCB_SORT );
-	if (ShowToolTips())
-		m_False->SetToolTip(_("The Dialog to hand control over to if the Roster doesn't meet the requirements"));
-	itemStaticBoxSizer13->Add(m_False, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_FalseStrings;
+   m_False = new wxComboBox( itemDialog1, ID_DOESNT_MEET, _T(""), wxDefaultPosition, wxDefaultSize, m_FalseStrings, wxCB_READONLY|wxCB_SORT );
+   if (ShowToolTips())
+      m_False->SetToolTip(_("The Dialog to hand control over to if the Roster doesn't meet the requirements"));
+   itemStaticBoxSizer13->Add(m_False, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStaticBox* itemStaticBoxSizer17Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer17 = new wxStaticBoxSizer(itemStaticBoxSizer17Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer17, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer17Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer17 = new wxStaticBoxSizer(itemStaticBoxSizer17Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer17, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Mode:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer17->Add(itemStaticText18, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Mode:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer17->Add(itemStaticText18, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer17->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer17->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString m_ModeStrings[] = {
-		_("Call"),
-		_("Goto")
-	};
-	m_Mode = new wxComboBox( itemDialog1, ID_MODE, _("Call"), wxDefaultPosition, wxDefaultSize, 2, m_ModeStrings, wxCB_DROPDOWN );
-	m_Mode->SetStringSelection(_("Call"));
-	if (ShowToolTips())
-		m_Mode->SetToolTip(_("Call-Returns when other Dialog is complete\n\nGoto-Exits all Dialogs once complete"));
-	itemStaticBoxSizer17->Add(m_Mode, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_ModeStrings;
+   m_ModeStrings.Add(_("Call"));
+   m_ModeStrings.Add(_("Goto"));
+   m_Mode = new wxComboBox( itemDialog1, ID_MODE, _("Call"), wxDefaultPosition, wxDefaultSize, m_ModeStrings, wxCB_DROPDOWN );
+   m_Mode->SetStringSelection(_("Call"));
+   if (ShowToolTips())
+      m_Mode->SetToolTip(_("Call-Returns when other Dialog is complete\n\nGoto-Exits all Dialogs once complete"));
+   itemStaticBoxSizer17->Add(m_Mode, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStdDialogButtonSizer* itemStdDialogButtonSizer21 = new wxStdDialogButtonSizer;
+   wxStdDialogButtonSizer* itemStdDialogButtonSizer21 = new wxStdDialogButtonSizer;
 
-	itemBoxSizer2->Add(itemStdDialogButtonSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
-	wxButton* itemButton22 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStdDialogButtonSizer21->AddButton(itemButton22);
+   itemBoxSizer2->Add(itemStdDialogButtonSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+   wxButton* itemButton22 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStdDialogButtonSizer21->AddButton(itemButton22);
 
-	wxButton* itemButton23 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStdDialogButtonSizer21->AddButton(itemButton23);
+   wxButton* itemButton23 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStdDialogButtonSizer21->AddButton(itemButton23);
 
-	itemStdDialogButtonSizer21->Realize();
+   itemStdDialogButtonSizer21->Realize();
 
 ////@end CheckRosterDialog content construction
 }
@@ -226,8 +226,8 @@ void CheckRosterDialog::CreateControls()
 void CheckRosterDialog::OnInitDialog( wxInitDialogEvent& event )
 {
 ////@begin wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_ROSTER in CheckRosterDialog.
-	// Before editing this code, remove the block markers.
-	event.Skip();
+   // Before editing this code, remove the block markers.
+   event.Skip();
 ////@end wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_ROSTER in CheckRosterDialog. 
 }
 
@@ -248,8 +248,8 @@ wxBitmap CheckRosterDialog::GetBitmapResource( const wxString& name )
 {
 	// Bitmap retrieval
 ////@begin CheckRosterDialog bitmap retrieval
-	wxUnusedVar(name);
-	return wxNullBitmap;
+   wxUnusedVar(name);
+   return wxNullBitmap;
 ////@end CheckRosterDialog bitmap retrieval
 }
 
@@ -261,7 +261,7 @@ wxIcon CheckRosterDialog::GetIconResource( const wxString& name )
 {
 	// Icon retrieval
 ////@begin CheckRosterDialog icon retrieval
-	wxUnusedVar(name);
-	return wxNullIcon;
+   wxUnusedVar(name);
+   return wxNullIcon;
 ////@end CheckRosterDialog icon retrieval
 }
diff --git a/pokemodr/gui/dlgCheckRoster.h b/pokemodr/gui/dlgCheckRoster.h
index 2d02e91c..c2bd6dc1 100644
--- a/pokemodr/gui/dlgCheckRoster.h
+++ b/pokemodr/gui/dlgCheckRoster.h
@@ -93,38 +93,38 @@ public:
 
 ////@begin CheckRosterDialog event handler declarations
 
-	/// wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_ROSTER
-	void OnInitDialog( wxInitDialogEvent& event );
+   /// wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_ROSTER
+   void OnInitDialog( wxInitDialogEvent& event );
 
 ////@end CheckRosterDialog event handler declarations
 
 ////@begin CheckRosterDialog member function declarations
 
-	/// Retrieves bitmap resources
-	wxBitmap GetBitmapResource( const wxString& name );
+   /// Retrieves bitmap resources
+   wxBitmap GetBitmapResource( const wxString& name );
 
-	/// Retrieves icon resources
-	wxIcon GetIconResource( const wxString& name );
+   /// Retrieves icon resources
+   wxIcon GetIconResource( const wxString& name );
 ////@end CheckRosterDialog member function declarations
 
 	/// Should we show tooltips?
 	static bool ShowToolTips();
 
 ////@begin CheckRosterDialog member variables
-	wxComboBox* m_Compare;
-	wxSpinCtrl* m_RosterSize;
-	wxComboBox* m_True;
-	wxComboBox* m_False;
-	wxComboBox* m_Mode;
-	/// Control identifiers
-	enum {
-		ID_DLG_CHECK_ROSTER = 10219,
-		ID_COMPARE = 10223,
-		ID_NUMBER = 10224,
-		ID_MEETS = 10226,
-		ID_DOESNT_MEET = 10228,
-		ID_MODE = 10230
-	};
+   wxComboBox* m_Compare;
+   wxSpinCtrl* m_RosterSize;
+   wxComboBox* m_True;
+   wxComboBox* m_False;
+   wxComboBox* m_Mode;
+   /// Control identifiers
+   enum {
+      ID_DLG_CHECK_ROSTER = 10219,
+      ID_COMPARE = 10223,
+      ID_NUMBER = 10224,
+      ID_MEETS = 10226,
+      ID_DOESNT_MEET = 10228,
+      ID_MODE = 10230
+   };
 ////@end CheckRosterDialog member variables
 };
 
diff --git a/pokemodr/gui/dlgCheckSpecies.cpp b/pokemodr/gui/dlgCheckSpecies.cpp
index 8ae32c40..457f635a 100644
--- a/pokemodr/gui/dlgCheckSpecies.cpp
+++ b/pokemodr/gui/dlgCheckSpecies.cpp
@@ -58,7 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS( CheckSpeciesDialog, wxDialog )
 BEGIN_EVENT_TABLE( CheckSpeciesDialog, wxDialog )
 
 ////@begin CheckSpeciesDialog event table entries
-	EVT_INIT_DIALOG( CheckSpeciesDialog::OnInitDialog )
+   EVT_INIT_DIALOG( CheckSpeciesDialog::OnInitDialog )
 
 ////@end CheckSpeciesDialog event table entries
 
@@ -86,14 +86,14 @@ CheckSpeciesDialog::CheckSpeciesDialog( wxWindow* parent, wxWindowID id, const w
 bool CheckSpeciesDialog::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
 ////@begin CheckSpeciesDialog creation
-	wxDialog::Create( parent, id, caption, pos, size, style );
-
-	CreateControls();
-	if (GetSizer())
-	{
-		GetSizer()->SetSizeHints(this);
-	}
-	Centre();
+   wxDialog::Create( parent, id, caption, pos, size, style );
+
+   CreateControls();
+   if (GetSizer())
+   {
+      GetSizer()->SetSizeHints(this);
+   }
+   Centre();
 ////@end CheckSpeciesDialog creation
 	return true;
 }
@@ -115,11 +115,10 @@ CheckSpeciesDialog::~CheckSpeciesDialog()
 void CheckSpeciesDialog::Init()
 {
 ////@begin CheckSpeciesDialog member initialisation
-	m_Compare = NULL;
-	m_Species = NULL;
-	m_True = NULL;
-	m_False = NULL;
-	m_Mode = NULL;
+   m_Species = NULL;
+   m_True = NULL;
+   m_False = NULL;
+   m_Mode = NULL;
 ////@end CheckSpeciesDialog member initialisation
 }
 /*!
@@ -129,93 +128,85 @@ void CheckSpeciesDialog::Init()
 void CheckSpeciesDialog::CreateControls()
 {    
 ////@begin CheckSpeciesDialog content construction
-	CheckSpeciesDialog* itemDialog1 = this;
+   CheckSpeciesDialog* itemDialog1 = this;
 
-	wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
-	itemDialog1->SetSizer(itemBoxSizer2);
+   wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
+   itemDialog1->SetSizer(itemBoxSizer2);
 
-	wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("Checks the team that the Player is carrying\nand hands control over to a Dialog depending\non whether the species meet  the requirements or not"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL|wxADJUST_MINSIZE, 0);
+   wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("Checks the team that the Player is carrying\nand hands control over to a Dialog depending\non whether the species meet  the requirements or not"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+   itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL, 0);
 
-	wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer4, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer4, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("Constraints:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("Constraints:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString m_CompareStrings[] = {
-		_("><")
-	};
-	m_Compare = new wxComboBox( itemDialog1, ID_COMPARE, _("="), wxDefaultPosition, wxDefaultSize, 1, m_CompareStrings, wxCB_READONLY );
-	m_Compare->SetStringSelection(_("="));
-	itemStaticBoxSizer4->Add(m_Compare, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_SpeciesStrings;
+   m_Species = new wxComboBox( itemDialog1, ID_NUMBER, _T(""), wxDefaultPosition, wxDefaultSize, m_SpeciesStrings, wxCB_READONLY|wxCB_SORT );
+   itemStaticBoxSizer4->Add(m_Species, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxString* m_SpeciesStrings = NULL;
-	m_Species = new wxComboBox( itemDialog1, ID_NUMBER, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_SpeciesStrings, wxCB_READONLY|wxCB_SORT );
-	itemStaticBoxSizer4->Add(m_Species, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxStaticBox* itemStaticBoxSizer8Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer8 = new wxStaticBoxSizer(itemStaticBoxSizer8Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer8, 0, wxGROW, 5);
 
-	wxStaticBox* itemStaticBoxSizer9Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer9 = new wxStaticBoxSizer(itemStaticBoxSizer9Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer9, 0, wxGROW, 5);
+   wxStaticText* itemStaticText9 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Meets:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer8->Add(itemStaticText9, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxStaticText* itemStaticText10 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Meets:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer9->Add(itemStaticText10, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   itemStaticBoxSizer8->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer9->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_TrueStrings;
+   m_True = new wxComboBox( itemDialog1, ID_MEETS, _T(""), wxDefaultPosition, wxDefaultSize, m_TrueStrings, wxCB_READONLY|wxCB_SORT );
+   if (ShowToolTips())
+      m_True->SetToolTip(_("The Dialog to hand control over to if the Species meet the constraints"));
+   itemStaticBoxSizer8->Add(m_True, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxString* m_TrueStrings = NULL;
-	m_True = new wxComboBox( itemDialog1, ID_MEETS, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_TrueStrings, wxCB_READONLY|wxCB_SORT );
-	if (ShowToolTips())
-		m_True->SetToolTip(_("The Dialog to hand control over to if the Species meet the constraints"));
-	itemStaticBoxSizer9->Add(m_True, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxStaticBox* itemStaticBoxSizer12Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer12 = new wxStaticBoxSizer(itemStaticBoxSizer12Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer12, 0, wxGROW, 5);
 
-	wxStaticBox* itemStaticBoxSizer13Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer13 = new wxStaticBoxSizer(itemStaticBoxSizer13Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer13, 0, wxGROW, 5);
+   wxStaticText* itemStaticText13 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Doesn't Meet:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer12->Add(itemStaticText13, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxStaticText* itemStaticText14 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Doesn't Meet:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer13->Add(itemStaticText14, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   itemStaticBoxSizer12->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer13->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_FalseStrings;
+   m_False = new wxComboBox( itemDialog1, ID_DOESNT_MEET, _T(""), wxDefaultPosition, wxDefaultSize, m_FalseStrings, wxCB_READONLY|wxCB_SORT );
+   if (ShowToolTips())
+      m_False->SetToolTip(_("The Dialog to hand control over to if the Species don't meet the requirements"));
+   itemStaticBoxSizer12->Add(m_False, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxString* m_FalseStrings = NULL;
-	m_False = new wxComboBox( itemDialog1, ID_DOESNT_MEET, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_FalseStrings, wxCB_READONLY|wxCB_SORT );
-	if (ShowToolTips())
-		m_False->SetToolTip(_("The Dialog to hand control over to if the Species don't meet the requirements"));
-	itemStaticBoxSizer13->Add(m_False, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxStaticBox* itemStaticBoxSizer16Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer16 = new wxStaticBoxSizer(itemStaticBoxSizer16Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer16, 0, wxGROW, 5);
 
-	wxStaticBox* itemStaticBoxSizer17Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer17 = new wxStaticBoxSizer(itemStaticBoxSizer17Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer17, 0, wxGROW, 5);
+   wxStaticText* itemStaticText17 = new wxStaticText( itemDialog1, wxID_STATIC, _("Mode:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer16->Add(itemStaticText17, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Mode:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer17->Add(itemStaticText18, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   itemStaticBoxSizer16->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer17->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_ModeStrings;
+   m_ModeStrings.Add(_("Call"));
+   m_ModeStrings.Add(_("Goto"));
+   m_Mode = new wxComboBox( itemDialog1, ID_MODE, _("Call"), wxDefaultPosition, wxDefaultSize, m_ModeStrings, wxCB_READONLY );
+   m_Mode->SetStringSelection(_("Call"));
+   if (ShowToolTips())
+      m_Mode->SetToolTip(_("Call-Returns when other Dialog is complete\n\nGoto-Exits all Dialogs once complete"));
+   itemStaticBoxSizer16->Add(m_Mode, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxString m_ModeStrings[] = {
-		_("Call"),
-		_("Goto")
-	};
-	m_Mode = new wxComboBox( itemDialog1, ID_MODE, _("Call"), wxDefaultPosition, wxDefaultSize, 2, m_ModeStrings, wxCB_READONLY );
-	m_Mode->SetStringSelection(_("Call"));
-	if (ShowToolTips())
-		m_Mode->SetToolTip(_("Call-Returns when other Dialog is complete\n\nGoto-Exits all Dialogs once complete"));
-	itemStaticBoxSizer17->Add(m_Mode, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxStdDialogButtonSizer* itemStdDialogButtonSizer20 = new wxStdDialogButtonSizer;
 
-	wxStdDialogButtonSizer* itemStdDialogButtonSizer21 = new wxStdDialogButtonSizer;
+   itemBoxSizer2->Add(itemStdDialogButtonSizer20, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+   wxButton* itemButton21 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStdDialogButtonSizer20->AddButton(itemButton21);
 
-	itemBoxSizer2->Add(itemStdDialogButtonSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
-	wxButton* itemButton22 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStdDialogButtonSizer21->AddButton(itemButton22);
+   wxButton* itemButton22 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStdDialogButtonSizer20->AddButton(itemButton22);
 
-	wxButton* itemButton23 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStdDialogButtonSizer21->AddButton(itemButton23);
-
-	itemStdDialogButtonSizer21->Realize();
+   itemStdDialogButtonSizer20->Realize();
 
 ////@end CheckSpeciesDialog content construction
 }
@@ -227,8 +218,8 @@ void CheckSpeciesDialog::CreateControls()
 void CheckSpeciesDialog::OnInitDialog( wxInitDialogEvent& event )
 {
 ////@begin wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_SPECIES in CheckSpeciesDialog.
-	// Before editing this code, remove the block markers.
-	event.Skip();
+   // Before editing this code, remove the block markers.
+   event.Skip();
 ////@end wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_SPECIES in CheckSpeciesDialog. 
 }
 
@@ -249,8 +240,8 @@ wxBitmap CheckSpeciesDialog::GetBitmapResource( const wxString& name )
 {
 	// Bitmap retrieval
 ////@begin CheckSpeciesDialog bitmap retrieval
-	wxUnusedVar(name);
-	return wxNullBitmap;
+   wxUnusedVar(name);
+   return wxNullBitmap;
 ////@end CheckSpeciesDialog bitmap retrieval
 }
 
@@ -262,7 +253,7 @@ wxIcon CheckSpeciesDialog::GetIconResource( const wxString& name )
 {
 	// Icon retrieval
 ////@begin CheckSpeciesDialog icon retrieval
-	wxUnusedVar(name);
-	return wxNullIcon;
+   wxUnusedVar(name);
+   return wxNullIcon;
 ////@end CheckSpeciesDialog icon retrieval
 }
diff --git a/pokemodr/gui/dlgCheckSpecies.h b/pokemodr/gui/dlgCheckSpecies.h
index 3139c2ff..a787ce0a 100644
--- a/pokemodr/gui/dlgCheckSpecies.h
+++ b/pokemodr/gui/dlgCheckSpecies.h
@@ -91,38 +91,36 @@ public:
 
 ////@begin CheckSpeciesDialog event handler declarations
 
-	/// wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_SPECIES
-	void OnInitDialog( wxInitDialogEvent& event );
+   /// wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_SPECIES
+   void OnInitDialog( wxInitDialogEvent& event );
 
 ////@end CheckSpeciesDialog event handler declarations
 
 ////@begin CheckSpeciesDialog member function declarations
 
-	/// Retrieves bitmap resources
-	wxBitmap GetBitmapResource( const wxString& name );
+   /// Retrieves bitmap resources
+   wxBitmap GetBitmapResource( const wxString& name );
 
-	/// Retrieves icon resources
-	wxIcon GetIconResource( const wxString& name );
+   /// Retrieves icon resources
+   wxIcon GetIconResource( const wxString& name );
 ////@end CheckSpeciesDialog member function declarations
 
 	/// Should we show tooltips?
 	static bool ShowToolTips();
 
 ////@begin CheckSpeciesDialog member variables
-	wxComboBox* m_Compare;
-	wxComboBox* m_Species;
-	wxComboBox* m_True;
-	wxComboBox* m_False;
-	wxComboBox* m_Mode;
-	/// Control identifiers
-	enum {
-		ID_DLG_CHECK_SPECIES = 10243,
-		ID_COMPARE = 10247,
-		ID_NUMBER = 10248,
-		ID_MEETS = 10250,
-		ID_DOESNT_MEET = 10252,
-		ID_MODE = 10254
-	};
+   wxComboBox* m_Species;
+   wxComboBox* m_True;
+   wxComboBox* m_False;
+   wxComboBox* m_Mode;
+   /// Control identifiers
+   enum {
+      ID_DLG_CHECK_SPECIES = 10243,
+      ID_NUMBER = 10248,
+      ID_MEETS = 10250,
+      ID_DOESNT_MEET = 10252,
+      ID_MODE = 10254
+   };
 ////@end CheckSpeciesDialog member variables
 };
 
diff --git a/pokemodr/gui/dlgGiveBadge.cpp b/pokemodr/gui/dlgGiveBadge.cpp
new file mode 100644
index 00000000..6e56279c
--- /dev/null
+++ b/pokemodr/gui/dlgGiveBadge.cpp
@@ -0,0 +1,219 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        dlgGiveBadge.cpp
+// Purpose:     
+// Author:      Ben Boeckel
+// Modified by: 
+// Created:     Thu 28 Jun 2007 11:18:52 EDT
+// Copyright:   ©2006-2007 Ben Boeckel and Nerdy Productions
+// Licence:     
+//    This program 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; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+//    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/////////////////////////////////////////////////////////////////////////////
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "dlgGiveBadge.h"
+#endif
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+
+////@begin includes
+////@end includes
+
+#include "dlgGiveBadge.h"
+
+////@begin XPM images
+
+////@end XPM images
+
+
+/*!
+ * GiveBadge type definition
+ */
+
+IMPLEMENT_DYNAMIC_CLASS( GiveBadge, wxDialog )
+
+
+/*!
+ * GiveBadge event table definition
+ */
+
+BEGIN_EVENT_TABLE( GiveBadge, wxDialog )
+
+////@begin GiveBadge event table entries
+   EVT_COMBOBOX( ID_BADGE, GiveBadge::OnBadgeSelected )
+
+////@end GiveBadge event table entries
+
+END_EVENT_TABLE()
+
+
+/*!
+ * GiveBadge constructors
+ */
+
+GiveBadge::GiveBadge()
+{
+   Init();
+}
+
+GiveBadge::GiveBadge( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+{
+   Init();
+   Create(parent, id, caption, pos, size, style);
+}
+
+
+/*!
+ * GiveBadge creator
+ */
+
+bool GiveBadge::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+{
+////@begin GiveBadge creation
+   SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
+   wxDialog::Create( parent, id, caption, pos, size, style );
+
+   CreateControls();
+   if (GetSizer())
+   {
+      GetSizer()->SetSizeHints(this);
+   }
+   Centre();
+////@end GiveBadge creation
+   return true;
+}
+
+
+/*!
+ * GiveBadge destructor
+ */
+
+GiveBadge::~GiveBadge()
+{
+////@begin GiveBadge destruction
+////@end GiveBadge destruction
+}
+
+
+/*!
+ * Member initialisation
+ */
+
+void GiveBadge::Init()
+{
+////@begin GiveBadge member initialisation
+   m_Badge = NULL;
+////@end GiveBadge member initialisation
+}
+
+
+/*!
+ * Control creation for GiveBadge
+ */
+
+void GiveBadge::CreateControls()
+{    
+////@begin GiveBadge content construction
+   GiveBadge* itemDialog1 = this;
+
+   wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
+   itemDialog1->SetSizer(itemBoxSizer2);
+
+   wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("Gives a Badge to the Player"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+
+   wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer4, 0, wxGROW, 5);
+
+   wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("Badge:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+
+   itemStaticBoxSizer4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+
+   wxArrayString m_BadgeStrings;
+   m_Badge = new wxComboBox( itemDialog1, ID_BADGE, _T(""), wxDefaultPosition, wxDefaultSize, m_BadgeStrings, wxCB_READONLY|wxCB_SORT );
+   itemStaticBoxSizer4->Add(m_Badge, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+
+   wxStdDialogButtonSizer* itemStdDialogButtonSizer8 = new wxStdDialogButtonSizer;
+
+   itemBoxSizer2->Add(itemStdDialogButtonSizer8, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+   wxButton* itemButton9 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStdDialogButtonSizer8->AddButton(itemButton9);
+
+   wxButton* itemButton10 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStdDialogButtonSizer8->AddButton(itemButton10);
+
+   itemStdDialogButtonSizer8->Realize();
+
+////@end GiveBadge content construction
+}
+
+
+/*!
+ * wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_BADGE
+ */
+
+void GiveBadge::OnBadgeSelected( wxCommandEvent& event )
+{
+////@begin wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_BADGE in GiveBadge.
+   // Before editing this code, remove the block markers.
+   event.Skip();
+////@end wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_BADGE in GiveBadge. 
+}
+
+
+/*!
+ * Should we show tooltips?
+ */
+
+bool GiveBadge::ShowToolTips()
+{
+   return true;
+}
+
+/*!
+ * Get bitmap resources
+ */
+
+wxBitmap GiveBadge::GetBitmapResource( const wxString& name )
+{
+   // Bitmap retrieval
+////@begin GiveBadge bitmap retrieval
+   wxUnusedVar(name);
+   return wxNullBitmap;
+////@end GiveBadge bitmap retrieval
+}
+
+/*!
+ * Get icon resources
+ */
+
+wxIcon GiveBadge::GetIconResource( const wxString& name )
+{
+   // Icon retrieval
+////@begin GiveBadge icon retrieval
+   wxUnusedVar(name);
+   return wxNullIcon;
+////@end GiveBadge icon retrieval
+}
diff --git a/pokemodr/gui/dlgGiveBadge.h b/pokemodr/gui/dlgGiveBadge.h
new file mode 100644
index 00000000..dbe7e7a9
--- /dev/null
+++ b/pokemodr/gui/dlgGiveBadge.h
@@ -0,0 +1,112 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        dlgGiveBadge.h
+// Purpose:     
+// Author:      Ben Boeckel
+// Modified by: 
+// Created:     Thu 28 Jun 2007 11:18:52 EDT
+// Copyright:   ©2006-2007 Ben Boeckel and Nerdy Productions
+// Licence:       
+//    This program 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; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+//    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _DLGGIVEBADGE_H_
+#define _DLGGIVEBADGE_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "dlgGiveBadge.h"
+#endif
+
+/*!
+ * Includes
+ */
+
+////@begin includes
+////@end includes
+
+/*!
+ * Forward declarations
+ */
+
+////@begin forward declarations
+////@end forward declarations
+
+/*!
+ * Control identifiers
+ */
+
+////@begin control identifiers
+#define SYMBOL_GIVEBADGE_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
+#define SYMBOL_GIVEBADGE_TITLE _("Give Badge")
+#define SYMBOL_GIVEBADGE_IDNAME ID_GIVEBADGE
+#define SYMBOL_GIVEBADGE_SIZE wxSize(400, 300)
+#define SYMBOL_GIVEBADGE_POSITION wxDefaultPosition
+////@end control identifiers
+
+
+/*!
+ * GiveBadge class declaration
+ */
+
+class GiveBadge: public wxDialog
+{    
+   DECLARE_DYNAMIC_CLASS( GiveBadge )
+   DECLARE_EVENT_TABLE()
+
+public:
+   /// Constructors
+   GiveBadge();
+   GiveBadge( wxWindow* parent, wxWindowID id = SYMBOL_GIVEBADGE_IDNAME, const wxString& caption = SYMBOL_GIVEBADGE_TITLE, const wxPoint& pos = SYMBOL_GIVEBADGE_POSITION, const wxSize& size = SYMBOL_GIVEBADGE_SIZE, long style = SYMBOL_GIVEBADGE_STYLE );
+
+   /// Creation
+   bool Create( wxWindow* parent, wxWindowID id = SYMBOL_GIVEBADGE_IDNAME, const wxString& caption = SYMBOL_GIVEBADGE_TITLE, const wxPoint& pos = SYMBOL_GIVEBADGE_POSITION, const wxSize& size = SYMBOL_GIVEBADGE_SIZE, long style = SYMBOL_GIVEBADGE_STYLE );
+
+   /// Destructor
+   ~GiveBadge();
+
+   /// Initialises member variables
+   void Init();
+
+   /// Creates the controls and sizers
+   void CreateControls();
+
+////@begin GiveBadge event handler declarations
+   /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_BADGE
+   void OnBadgeSelected( wxCommandEvent& event );
+
+////@end GiveBadge event handler declarations
+
+////@begin GiveBadge member function declarations
+   /// Retrieves bitmap resources
+   wxBitmap GetBitmapResource( const wxString& name );
+
+   /// Retrieves icon resources
+   wxIcon GetIconResource( const wxString& name );
+////@end GiveBadge member function declarations
+
+   /// Should we show tooltips?
+   static bool ShowToolTips();
+
+////@begin GiveBadge member variables
+   wxComboBox* m_Badge;
+   /// Control identifiers
+   enum {
+      ID_GIVEBADGE = 10490,
+      ID_BADGE = 10029
+   };
+////@end GiveBadge member variables
+};
+
+#endif
+   // _DLGGIVEBADGE_H_
diff --git a/pokemodr/gui/dlgYesNo.cpp b/pokemodr/gui/dlgYesNo.cpp
index e89bdd4d..b51757c2 100644
--- a/pokemodr/gui/dlgYesNo.cpp
+++ b/pokemodr/gui/dlgYesNo.cpp
@@ -58,7 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS( YesNoDialog, wxDialog )
 BEGIN_EVENT_TABLE( YesNoDialog, wxDialog )
 
 ////@begin YesNoDialog event table entries
-	EVT_INIT_DIALOG( YesNoDialog::OnInitDialog )
+   EVT_INIT_DIALOG( YesNoDialog::OnInitDialog )
 
 ////@end YesNoDialog event table entries
 
@@ -86,14 +86,14 @@ YesNoDialog::YesNoDialog( wxWindow* parent, wxWindowID id, const wxString& capti
 bool YesNoDialog::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
 ////@begin YesNoDialog creation
-	wxDialog::Create( parent, id, caption, pos, size, style );
-
-	CreateControls();
-	if (GetSizer())
-	{
-		GetSizer()->SetSizeHints(this);
-	}
-	Centre();
+   wxDialog::Create( parent, id, caption, pos, size, style );
+
+   CreateControls();
+   if (GetSizer())
+   {
+      GetSizer()->SetSizeHints(this);
+   }
+   Centre();
 ////@end YesNoDialog creation
 	return true;
 }
@@ -115,9 +115,9 @@ YesNoDialog::~YesNoDialog()
 void YesNoDialog::Init()
 {
 ////@begin YesNoDialog member initialisation
-	m_Yes = NULL;
-	m_No = NULL;
-	m_Mode = NULL;
+   m_Yes = NULL;
+   m_No = NULL;
+   m_Mode = NULL;
 ////@end YesNoDialog member initialisation
 }
 /*!
@@ -127,73 +127,72 @@ void YesNoDialog::Init()
 void YesNoDialog::CreateControls()
 {    
 ////@begin YesNoDialog content construction
-	YesNoDialog* itemDialog1 = this;
+   YesNoDialog* itemDialog1 = this;
 
-	wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
-	itemDialog1->SetSizer(itemBoxSizer2);
+   wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
+   itemDialog1->SetSizer(itemBoxSizer2);
 
-	wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("This gives the Player a Yes/No decision.\nIt hands control over to another Dialog depending on the answer."), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL|wxADJUST_MINSIZE, 0);
+   wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("This gives the Player a Yes/No decision.\nIt hands control over to another Dialog depending on the answer."), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+   itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL, 0);
 
-	wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer4, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer4, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Yes:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Yes:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString* m_YesStrings = NULL;
-	m_Yes = new wxComboBox( itemDialog1, ID_YES, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_YesStrings, wxCB_DROPDOWN|wxCB_SORT );
-	if (ShowToolTips())
-		m_Yes->SetToolTip(_("The Dialog to hand control over to it the Player answers Yes"));
-	itemStaticBoxSizer4->Add(m_Yes, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_YesStrings;
+   m_Yes = new wxComboBox( itemDialog1, ID_YES, _T(""), wxDefaultPosition, wxDefaultSize, m_YesStrings, wxCB_DROPDOWN|wxCB_SORT );
+   if (ShowToolTips())
+      m_Yes->SetToolTip(_("The Dialog to hand control over to it the Player answers Yes"));
+   itemStaticBoxSizer4->Add(m_Yes, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStaticBox* itemStaticBoxSizer8Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer8 = new wxStaticBoxSizer(itemStaticBoxSizer8Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer8, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer8Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer8 = new wxStaticBoxSizer(itemStaticBoxSizer8Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer8, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText9 = new wxStaticText( itemDialog1, wxID_STATIC, _("If No:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer8->Add(itemStaticText9, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText9 = new wxStaticText( itemDialog1, wxID_STATIC, _("If No:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer8->Add(itemStaticText9, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer8->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer8->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString* m_NoStrings = NULL;
-	m_No = new wxComboBox( itemDialog1, ID_NO, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_NoStrings, wxCB_READONLY|wxCB_SORT );
-	if (ShowToolTips())
-		m_No->SetToolTip(_("The Dialog to hand control over to it the Player answers No"));
-	itemStaticBoxSizer8->Add(m_No, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_NoStrings;
+   m_No = new wxComboBox( itemDialog1, ID_NO, _T(""), wxDefaultPosition, wxDefaultSize, m_NoStrings, wxCB_READONLY|wxCB_SORT );
+   if (ShowToolTips())
+      m_No->SetToolTip(_("The Dialog to hand control over to it the Player answers No"));
+   itemStaticBoxSizer8->Add(m_No, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStaticBox* itemStaticBoxSizer12Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer12 = new wxStaticBoxSizer(itemStaticBoxSizer12Static, wxHORIZONTAL);
-	itemBoxSizer2->Add(itemStaticBoxSizer12, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer12Static = new wxStaticBox(itemDialog1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer12 = new wxStaticBoxSizer(itemStaticBoxSizer12Static, wxHORIZONTAL);
+   itemBoxSizer2->Add(itemStaticBoxSizer12, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText13 = new wxStaticText( itemDialog1, wxID_STATIC, _("Mode:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer12->Add(itemStaticText13, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText13 = new wxStaticText( itemDialog1, wxID_STATIC, _("Mode:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer12->Add(itemStaticText13, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer12->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer12->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString m_ModeStrings[] = {
-		_("Call"),
-		_("Goto")
-	};
-	m_Mode = new wxComboBox( itemDialog1, ID_MODE, _("Call"), wxDefaultPosition, wxDefaultSize, 2, m_ModeStrings, wxCB_READONLY );
-	m_Mode->SetStringSelection(_("Call"));
-	if (ShowToolTips())
-		m_Mode->SetToolTip(_("Call-Returns when other Dialog is complete\n\nGoto-Exits all Dialogs once complete"));
-	itemStaticBoxSizer12->Add(m_Mode, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_ModeStrings;
+   m_ModeStrings.Add(_("Call"));
+   m_ModeStrings.Add(_("Goto"));
+   m_Mode = new wxComboBox( itemDialog1, ID_MODE, _("Call"), wxDefaultPosition, wxDefaultSize, m_ModeStrings, wxCB_READONLY );
+   m_Mode->SetStringSelection(_("Call"));
+   if (ShowToolTips())
+      m_Mode->SetToolTip(_("Call-Returns when other Dialog is complete\n\nGoto-Exits all Dialogs once complete"));
+   itemStaticBoxSizer12->Add(m_Mode, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStdDialogButtonSizer* itemStdDialogButtonSizer16 = new wxStdDialogButtonSizer;
+   wxStdDialogButtonSizer* itemStdDialogButtonSizer16 = new wxStdDialogButtonSizer;
 
-	itemBoxSizer2->Add(itemStdDialogButtonSizer16, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
-	wxButton* itemButton17 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStdDialogButtonSizer16->AddButton(itemButton17);
+   itemBoxSizer2->Add(itemStdDialogButtonSizer16, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+   wxButton* itemButton17 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStdDialogButtonSizer16->AddButton(itemButton17);
 
-	wxButton* itemButton18 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStdDialogButtonSizer16->AddButton(itemButton18);
+   wxButton* itemButton18 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStdDialogButtonSizer16->AddButton(itemButton18);
 
-	itemStdDialogButtonSizer16->Realize();
+   itemStdDialogButtonSizer16->Realize();
 
 ////@end YesNoDialog content construction
 }
@@ -205,8 +204,8 @@ void YesNoDialog::CreateControls()
 void YesNoDialog::OnInitDialog( wxInitDialogEvent& event )
 {
 ////@begin wxEVT_INIT_DIALOG event handler for ID_DLG_YES_NO in YesNoDialog.
-	// Before editing this code, remove the block markers.
-	event.Skip();
+   // Before editing this code, remove the block markers.
+   event.Skip();
 ////@end wxEVT_INIT_DIALOG event handler for ID_DLG_YES_NO in YesNoDialog. 
 }
 
@@ -227,8 +226,8 @@ wxBitmap YesNoDialog::GetBitmapResource( const wxString& name )
 {
 	// Bitmap retrieval
 ////@begin YesNoDialog bitmap retrieval
-	wxUnusedVar(name);
-	return wxNullBitmap;
+   wxUnusedVar(name);
+   return wxNullBitmap;
 ////@end YesNoDialog bitmap retrieval
 }
 
@@ -240,7 +239,7 @@ wxIcon YesNoDialog::GetIconResource( const wxString& name )
 {
 	// Icon retrieval
 ////@begin YesNoDialog icon retrieval
-	wxUnusedVar(name);
-	return wxNullIcon;
+   wxUnusedVar(name);
+   return wxNullIcon;
 ////@end YesNoDialog icon retrieval
 }
diff --git a/pokemodr/gui/dlgYesNo.h b/pokemodr/gui/dlgYesNo.h
index 48c4c5c2..be184563 100644
--- a/pokemodr/gui/dlgYesNo.h
+++ b/pokemodr/gui/dlgYesNo.h
@@ -91,34 +91,34 @@ public:
 
 ////@begin YesNoDialog event handler declarations
 
-	/// wxEVT_INIT_DIALOG event handler for ID_DLG_YES_NO
-	void OnInitDialog( wxInitDialogEvent& event );
+   /// wxEVT_INIT_DIALOG event handler for ID_DLG_YES_NO
+   void OnInitDialog( wxInitDialogEvent& event );
 
 ////@end YesNoDialog event handler declarations
 
 ////@begin YesNoDialog member function declarations
 
-	/// Retrieves bitmap resources
-	wxBitmap GetBitmapResource( const wxString& name );
+   /// Retrieves bitmap resources
+   wxBitmap GetBitmapResource( const wxString& name );
 
-	/// Retrieves icon resources
-	wxIcon GetIconResource( const wxString& name );
+   /// Retrieves icon resources
+   wxIcon GetIconResource( const wxString& name );
 ////@end YesNoDialog member function declarations
 
 	/// Should we show tooltips?
 	static bool ShowToolTips();
 
 ////@begin YesNoDialog member variables
-	wxComboBox* m_Yes;
-	wxComboBox* m_No;
-	wxComboBox* m_Mode;
-	/// Control identifiers
-	enum {
-		ID_DLG_YES_NO = 10065,
-		ID_YES = 10068,
-		ID_NO = 10070,
-		ID_MODE = 10072
-	};
+   wxComboBox* m_Yes;
+   wxComboBox* m_No;
+   wxComboBox* m_Mode;
+   /// Control identifiers
+   enum {
+      ID_DLG_YES_NO = 10065,
+      ID_YES = 10068,
+      ID_NO = 10070,
+      ID_MODE = 10072
+   };
 ////@end YesNoDialog member variables
 };
 
diff --git a/pokemodr/gui/menuEntry.cpp b/pokemodr/gui/menuEntry.cpp
index 9ac8940a..7256bd7a 100644
--- a/pokemodr/gui/menuEntry.cpp
+++ b/pokemodr/gui/menuEntry.cpp
@@ -58,13 +58,13 @@ IMPLEMENT_DYNAMIC_CLASS( MenuItemPanel, wxPanel )
 BEGIN_EVENT_TABLE( MenuItemPanel, wxPanel )
 
 ////@begin MenuItemPanel event table entries
-	EVT_INIT_DIALOG( MenuItemPanel::OnInitDialog )
+   EVT_INIT_DIALOG( MenuItemPanel::OnInitDialog )
 
-	EVT_BUTTON( ID_DELETE, MenuItemPanel::OnDeleteClick )
+   EVT_BUTTON( ID_DELETE, MenuItemPanel::OnDeleteClick )
 
-	EVT_BUTTON( ID_MOVE_UP, MenuItemPanel::OnMoveUpClick )
+   EVT_BUTTON( ID_MOVE_UP, MenuItemPanel::OnMoveUpClick )
 
-	EVT_BUTTON( ID_MOVE_DOWN, MenuItemPanel::OnMoveDownClick )
+   EVT_BUTTON( ID_MOVE_DOWN, MenuItemPanel::OnMoveDownClick )
 
 ////@end MenuItemPanel event table entries
 
@@ -92,13 +92,13 @@ MenuItemPanel::MenuItemPanel( wxWindow* parent, wxWindowID id, const wxPoint& po
 bool MenuItemPanel::Create( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style )
 {
 ////@begin MenuItemPanel creation
-	wxPanel::Create( parent, id, pos, size, style );
+   wxPanel::Create( parent, id, pos, size, style );
 
-	CreateControls();
-	if (GetSizer())
-	{
-		GetSizer()->SetSizeHints(this);
-	}
+   CreateControls();
+   if (GetSizer())
+   {
+      GetSizer()->SetSizeHints(this);
+   }
 ////@end MenuItemPanel creation
 	return true;
 }
@@ -120,8 +120,8 @@ MenuItemPanel::~MenuItemPanel()
 void MenuItemPanel::Init()
 {
 ////@begin MenuItemPanel member initialisation
-	m_Option = NULL;
-	m_Dialog = NULL;
+   m_Option = NULL;
+   m_Dialog = NULL;
 ////@end MenuItemPanel member initialisation
 }
 /*!
@@ -131,59 +131,59 @@ void MenuItemPanel::Init()
 void MenuItemPanel::CreateControls()
 {    
 ////@begin MenuItemPanel content construction
-	MenuItemPanel* itemPanel1 = this;
+   MenuItemPanel* itemPanel1 = this;
 
-	wxStaticBox* itemStaticBoxSizer2Static = new wxStaticBox(itemPanel1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer2 = new wxStaticBoxSizer(itemStaticBoxSizer2Static, wxVERTICAL);
-	itemPanel1->SetSizer(itemStaticBoxSizer2);
+   wxStaticBox* itemStaticBoxSizer2Static = new wxStaticBox(itemPanel1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer2 = new wxStaticBoxSizer(itemStaticBoxSizer2Static, wxVERTICAL);
+   itemPanel1->SetSizer(itemStaticBoxSizer2);
 
-	wxStaticBox* itemStaticBoxSizer3Static = new wxStaticBox(itemPanel1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer3 = new wxStaticBoxSizer(itemStaticBoxSizer3Static, wxHORIZONTAL);
-	itemStaticBoxSizer2->Add(itemStaticBoxSizer3, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer3Static = new wxStaticBox(itemPanel1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer3 = new wxStaticBoxSizer(itemStaticBoxSizer3Static, wxHORIZONTAL);
+   itemStaticBoxSizer2->Add(itemStaticBoxSizer3, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText4 = new wxStaticText( itemPanel1, wxID_STATIC, _("Option:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer3->Add(itemStaticText4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText4 = new wxStaticText( itemPanel1, wxID_STATIC, _("Option:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer3->Add(itemStaticText4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer3->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer3->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	m_Option = new wxTextCtrl( itemPanel1, ID_OPTION, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
-	if (ShowToolTips())
-		m_Option->SetToolTip(_("The name of the option"));
-	itemStaticBoxSizer3->Add(m_Option, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   m_Option = new wxTextCtrl( itemPanel1, ID_OPTION, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
+   if (ShowToolTips())
+      m_Option->SetToolTip(_("The name of the option"));
+   itemStaticBoxSizer3->Add(m_Option, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStaticBox* itemStaticBoxSizer7Static = new wxStaticBox(itemPanel1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer7 = new wxStaticBoxSizer(itemStaticBoxSizer7Static, wxHORIZONTAL);
-	itemStaticBoxSizer2->Add(itemStaticBoxSizer7, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer7Static = new wxStaticBox(itemPanel1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer7 = new wxStaticBoxSizer(itemStaticBoxSizer7Static, wxHORIZONTAL);
+   itemStaticBoxSizer2->Add(itemStaticBoxSizer7, 0, wxGROW, 5);
 
-	wxStaticText* itemStaticText8 = new wxStaticText( itemPanel1, wxID_STATIC, _("Dialog:"), wxDefaultPosition, wxDefaultSize, 0 );
-	itemStaticBoxSizer7->Add(itemStaticText8, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
+   wxStaticText* itemStaticText8 = new wxStaticText( itemPanel1, wxID_STATIC, _("Dialog:"), wxDefaultPosition, wxDefaultSize, 0 );
+   itemStaticBoxSizer7->Add(itemStaticText8, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	itemStaticBoxSizer7->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   itemStaticBoxSizer7->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxString* m_DialogStrings = NULL;
-	m_Dialog = new wxComboBox( itemPanel1, ID_DIALOG, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_DialogStrings, wxCB_READONLY|wxCB_SORT );
-	if (ShowToolTips())
-		m_Dialog->SetToolTip(_("The dialog to hand control over to if this option is chosen"));
-	itemStaticBoxSizer7->Add(m_Dialog, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+   wxArrayString m_DialogStrings;
+   m_Dialog = new wxComboBox( itemPanel1, ID_DIALOG, _T(""), wxDefaultPosition, wxDefaultSize, m_DialogStrings, wxCB_READONLY|wxCB_SORT );
+   if (ShowToolTips())
+      m_Dialog->SetToolTip(_("The dialog to hand control over to if this option is chosen"));
+   itemStaticBoxSizer7->Add(m_Dialog, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
 
-	wxStaticBox* itemStaticBoxSizer11Static = new wxStaticBox(itemPanel1, wxID_ANY, _T(""));
-	wxStaticBoxSizer* itemStaticBoxSizer11 = new wxStaticBoxSizer(itemStaticBoxSizer11Static, wxHORIZONTAL);
-	itemStaticBoxSizer2->Add(itemStaticBoxSizer11, 0, wxGROW, 5);
+   wxStaticBox* itemStaticBoxSizer11Static = new wxStaticBox(itemPanel1, wxID_ANY, _T(""));
+   wxStaticBoxSizer* itemStaticBoxSizer11 = new wxStaticBoxSizer(itemStaticBoxSizer11Static, wxHORIZONTAL);
+   itemStaticBoxSizer2->Add(itemStaticBoxSizer11, 0, wxGROW, 5);
 
-	wxButton* itemButton12 = new wxButton( itemPanel1, ID_DELETE, _("Delete"), wxDefaultPosition, wxDefaultSize, 0 );
-	if (ShowToolTips())
-		itemButton12->SetToolTip(_("Delete this menu item"));
-	itemStaticBoxSizer11->Add(itemButton12, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   wxButton* itemButton12 = new wxButton( itemPanel1, ID_DELETE, _("Delete"), wxDefaultPosition, wxDefaultSize, 0 );
+   if (ShowToolTips())
+      itemButton12->SetToolTip(_("Delete this menu item"));
+   itemStaticBoxSizer11->Add(itemButton12, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxButton* itemButton13 = new wxButton( itemPanel1, ID_MOVE_UP, _("Move Up"), wxDefaultPosition, wxDefaultSize, 0 );
-	if (ShowToolTips())
-		itemButton13->SetToolTip(_("Move this menu item up"));
-	itemStaticBoxSizer11->Add(itemButton13, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   wxButton* itemButton13 = new wxButton( itemPanel1, ID_MOVE_UP, _("Move Up"), wxDefaultPosition, wxDefaultSize, 0 );
+   if (ShowToolTips())
+      itemButton13->SetToolTip(_("Move this menu item up"));
+   itemStaticBoxSizer11->Add(itemButton13, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
-	wxButton* itemButton14 = new wxButton( itemPanel1, ID_MOVE_DOWN, _("Move Down"), wxDefaultPosition, wxDefaultSize, 0 );
-	if (ShowToolTips())
-		itemButton14->SetToolTip(_("Move this menu item down"));
-	itemStaticBoxSizer11->Add(itemButton14, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
+   wxButton* itemButton14 = new wxButton( itemPanel1, ID_MOVE_DOWN, _("Move Down"), wxDefaultPosition, wxDefaultSize, 0 );
+   if (ShowToolTips())
+      itemButton14->SetToolTip(_("Move this menu item down"));
+   itemStaticBoxSizer11->Add(itemButton14, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
 ////@end MenuItemPanel content construction
 }
@@ -195,8 +195,8 @@ void MenuItemPanel::CreateControls()
 void MenuItemPanel::OnInitDialog( wxInitDialogEvent& event )
 {
 ////@begin wxEVT_INIT_DIALOG event handler for ID_MENU_ITEM in MenuItemPanel.
-	// Before editing this code, remove the block markers.
-	event.Skip();
+   // Before editing this code, remove the block markers.
+   event.Skip();
 ////@end wxEVT_INIT_DIALOG event handler for ID_MENU_ITEM in MenuItemPanel. 
 }
 
@@ -207,8 +207,8 @@ void MenuItemPanel::OnInitDialog( wxInitDialogEvent& event )
 void MenuItemPanel::OnDeleteClick( wxCommandEvent& event )
 {
 ////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_DELETE in MenuItemPanel.
-	// Before editing this code, remove the block markers.
-	event.Skip();
+   // Before editing this code, remove the block markers.
+   event.Skip();
 ////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_DELETE in MenuItemPanel. 
 }
 
@@ -219,8 +219,8 @@ void MenuItemPanel::OnDeleteClick( wxCommandEvent& event )
 void MenuItemPanel::OnMoveUpClick( wxCommandEvent& event )
 {
 ////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_MOVE_UP in MenuItemPanel.
-	// Before editing this code, remove the block markers.
-	event.Skip();
+   // Before editing this code, remove the block markers.
+   event.Skip();
 ////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_MOVE_UP in MenuItemPanel. 
 }
 
@@ -231,8 +231,8 @@ void MenuItemPanel::OnMoveUpClick( wxCommandEvent& event )
 void MenuItemPanel::OnMoveDownClick( wxCommandEvent& event )
 {
 ////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_MOVE_DOWN in MenuItemPanel.
-	// Before editing this code, remove the block markers.
-	event.Skip();
+   // Before editing this code, remove the block markers.
+   event.Skip();
 ////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_MOVE_DOWN in MenuItemPanel. 
 }
 
@@ -253,8 +253,8 @@ wxBitmap MenuItemPanel::GetBitmapResource( const wxString& name )
 {
 	// Bitmap retrieval
 ////@begin MenuItemPanel bitmap retrieval
-	wxUnusedVar(name);
-	return wxNullBitmap;
+   wxUnusedVar(name);
+   return wxNullBitmap;
 ////@end MenuItemPanel bitmap retrieval
 }
 
@@ -266,7 +266,7 @@ wxIcon MenuItemPanel::GetIconResource( const wxString& name )
 {
 	// Icon retrieval
 ////@begin MenuItemPanel icon retrieval
-	wxUnusedVar(name);
-	return wxNullIcon;
+   wxUnusedVar(name);
+   return wxNullIcon;
 ////@end MenuItemPanel icon retrieval
 }
diff --git a/pokemodr/gui/menuEntry.h b/pokemodr/gui/menuEntry.h
index 8fe5af74..f85d2196 100644
--- a/pokemodr/gui/menuEntry.h
+++ b/pokemodr/gui/menuEntry.h
@@ -49,7 +49,7 @@
 
 ////@begin control identifiers
 #define SYMBOL_MENUITEMPANEL_STYLE 0
-#define SYMBOL_MENUITEMPANEL_TITLE _("wxPanel ID_MENU_ITEM")
+#define SYMBOL_MENUITEMPANEL_TITLE _("MenuItem")
 #define SYMBOL_MENUITEMPANEL_IDNAME ID_MENU_ITEM
 #define SYMBOL_MENUITEMPANEL_SIZE wxDefaultSize
 #define SYMBOL_MENUITEMPANEL_POSITION wxDefaultPosition
@@ -91,44 +91,44 @@ public:
 
 ////@begin MenuItemPanel event handler declarations
 
-	/// wxEVT_INIT_DIALOG event handler for ID_MENU_ITEM
-	void OnInitDialog( wxInitDialogEvent& event );
+   /// wxEVT_INIT_DIALOG event handler for ID_MENU_ITEM
+   void OnInitDialog( wxInitDialogEvent& event );
 
-	/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_DELETE
-	void OnDeleteClick( wxCommandEvent& event );
+   /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_DELETE
+   void OnDeleteClick( wxCommandEvent& event );
 
-	/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_MOVE_UP
-	void OnMoveUpClick( wxCommandEvent& event );
+   /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_MOVE_UP
+   void OnMoveUpClick( wxCommandEvent& event );
 
-	/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_MOVE_DOWN
-	void OnMoveDownClick( wxCommandEvent& event );
+   /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_MOVE_DOWN
+   void OnMoveDownClick( wxCommandEvent& event );
 
 ////@end MenuItemPanel event handler declarations
 
 ////@begin MenuItemPanel member function declarations
 
-	/// Retrieves bitmap resources
-	wxBitmap GetBitmapResource( const wxString& name );
+   /// Retrieves bitmap resources
+   wxBitmap GetBitmapResource( const wxString& name );
 
-	/// Retrieves icon resources
-	wxIcon GetIconResource( const wxString& name );
+   /// Retrieves icon resources
+   wxIcon GetIconResource( const wxString& name );
 ////@end MenuItemPanel member function declarations
 
 	/// Should we show tooltips?
 	static bool ShowToolTips();
 
 ////@begin MenuItemPanel member variables
-	wxTextCtrl* m_Option;
-	wxComboBox* m_Dialog;
-	/// Control identifiers
-	enum {
-		ID_MENU_ITEM = 10323,
-		ID_OPTION = 10325,
-		ID_DIALOG = 10327,
-		ID_DELETE = 10328,
-		ID_MOVE_UP = 10329,
-		ID_MOVE_DOWN = 10330
-	};
+   wxTextCtrl* m_Option;
+   wxComboBox* m_Dialog;
+   /// Control identifiers
+   enum {
+      ID_MENU_ITEM = 10323,
+      ID_OPTION = 10325,
+      ID_DIALOG = 10327,
+      ID_DELETE = 10328,
+      ID_MOVE_UP = 10329,
+      ID_MOVE_DOWN = 10330
+   };
 ////@end MenuItemPanel member variables
 };
 
diff --git a/pokemodr/images/overlays/effect.png b/pokemodr/images/overlays/effect.png
index 2748d977..6d4c38a1 100644
Binary files a/pokemodr/images/overlays/effect.png and b/pokemodr/images/overlays/effect.png differ
diff --git a/pokemodr/images/overlays/no-walk.png b/pokemodr/images/overlays/no-walk.png
index 1796045f..11b15e81 100644
Binary files a/pokemodr/images/overlays/no-walk.png and b/pokemodr/images/overlays/no-walk.png differ
diff --git a/pokemodr/images/overlays/trainer.png b/pokemodr/images/overlays/trainer.png
index 92d0e1aa..e0d23cae 100644
Binary files a/pokemodr/images/overlays/trainer.png and b/pokemodr/images/overlays/trainer.png differ
diff --git a/pokemodr/images/overlays/walk.png b/pokemodr/images/overlays/walk.png
index bcfe5691..f4e69557 100644
Binary files a/pokemodr/images/overlays/walk.png and b/pokemodr/images/overlays/walk.png differ
diff --git a/pokemodr/images/overlays/warp.png b/pokemodr/images/overlays/warp.png
index 87e24a5b..20baeb10 100644
Binary files a/pokemodr/images/overlays/warp.png and b/pokemodr/images/overlays/warp.png differ
diff --git a/pokemodr/images/overlays/water.png b/pokemodr/images/overlays/water.png
index 379a3d98..b625a0b0 100644
Binary files a/pokemodr/images/overlays/water.png and b/pokemodr/images/overlays/water.png differ
diff --git a/pokemodr/images/overlays/wilds.png b/pokemodr/images/overlays/wilds.png
index ebce3ed5..45dcda5f 100644
Binary files a/pokemodr/images/overlays/wilds.png and b/pokemodr/images/overlays/wilds.png differ
-- 
cgit