Redoing rev25

[ADD] DISCLAIMER
[FIX] PokemonEvolution styles
[ADD] Relative enumeration
[DEL] pokemod/Status.{h, cpp}
[DEL] pokemod/StatusEffect.{h, cpp}
[FIX] Status effects will be added as needed instead of customized
[FIX] Completed ItemEffects
[FIX] Factored out Natures to be global
[DEL] pokemod/PokemonNature.{h, cpp}
[DEL] ai/Net.{h, cpp}
[DEL] ai/Layer/{h, cpp}
[ADD] battle/Arena.{h, cpp}
[ADD] battle/Team.{h, cpp}
[ADD] battle/Human.{h, cpp}
[ADD] battle/Bot.{h, cpp}
[ADD] battle/GhostBot.{h, cpp}
[ADD] battle/Pokemon.{h, cpp}
[ADD] battle/Ghost.{h, cpp}
[FIX] Fixed some scope errors in pokemod
[ADD] audio/audio.pro
[ADD] audio/Audio.{h, cpp}
[ADD] audio/AudioLibrary.{h, cpp}
[ADD] audio/AudioSystem.{h, cpp}
[ADD] audio/Music.{h, cpp}
[ADD] audio/SoundEffect.{h, cpp}
[DEL] old audio system (was in C)
[FIX] Optimized some routines in pokemod
[FIX] Moved global classes (Ini, Frac, Matrix, FracMatrix, Point, Flag) to general

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@27 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 2 insertions, 5 deletions

diff --git a/pokemod/MapEffect.h b/pokemod/MapEffect.h
index b1a83a9e..1b23828d 100644
--- a/pokemod/MapEffect.h
+++ b/pokemod/MapEffect.h
@@ -26,8 +26,8 @@
 #include <QFile>
 #include <QString>
 #include "Object.h"
-#include "Flag.h"
-#include "Point.h"
+#include "../general/Flag.h"
+#include "../general/Point.h"
 #include "Dialog.h"
 
 namespace PokeGen
@@ -113,9 +113,6 @@ namespace PokeGen
                 bool canMove;
                 unsigned dialog;
         };
-        
-        const char* MapEffectStr[MapEffect::E_End] = {"Item", "PC", "Strength Block", "Button", "Rock Smash", "Slot Machine", "Card Flip Game"};
-        const char* PCTypeStr[MapEffect::PC_End] = {"Item", "Pokémon", "PokéDex", "Hall of Fame", "All"};
     }
 }