summaryrefslogtreecommitdiffstats
path: root/pokemod/MapEffect.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'pokemod/MapEffect.cpp')
-rw-r--r--pokemod/MapEffect.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/pokemod/MapEffect.cpp b/pokemod/MapEffect.cpp
index 5d212f54..14b50d8d 100644
--- a/pokemod/MapEffect.cpp
+++ b/pokemod/MapEffect.cpp
@@ -22,6 +22,9 @@
#include "MapEffect.h"
+const char* PokeGen::PokeMod::MapEffect::MapEffectStr[PokeGen::PokeMod::MapEffect::E_End] = {"Item", "PC", "Strength Block", "Button", "Rock Smash", "Slot Machine", "Card Flip Game"};
+const char* PokeGen::PokeMod::MapEffect::PCTypeStr[PokeGen::PokeMod::MapEffect::PC_End] = {"Item", "Pokémon", "PokéDex", "Hall of Fame", "All"};
+
PokeGen::PokeMod::MapEffect::MapEffect(const Pokemod* par, const unsigned _id) :
Object(_id, par),
name(""),
@@ -91,7 +94,7 @@ bool PokeGen::PokeMod::MapEffect::Validate()
pokemod->ValidationMsg("Invalid effect");
isValid = false;
}
- if (DIR_End <= direction)
+ if (D_End_None <= direction)
{
pokemod->ValidationMsg("Invalid driection");
isValid = false;
@@ -248,7 +251,7 @@ bool PokeGen::PokeMod::MapEffect::SetVal2(const unsigned v2)
bool PokeGen::PokeMod::MapEffect::SetDirection(const unsigned d)
{
- if (d < DIR_End_None)
+ if (d < D_End_None)
direction = d;
return (direction == d);
}
@@ -275,7 +278,7 @@ QString PokeGen::PokeMod::MapEffect::GetName() const
return name;
}
-PokeGen::PokeMod::Point PokeGen::PokeMod::MapEffect::GetCoordinate() const
+PokeGen::Point PokeGen::PokeMod::MapEffect::GetCoordinate() const
{
return coordinate;
}
@@ -290,7 +293,7 @@ unsigned PokeGen::PokeMod::MapEffect::GetCoordinateY() const
return coordinate.GetY();
}
-PokeGen::PokeMod::Flag PokeGen::PokeMod::MapEffect::GetExistFlag() const
+PokeGen::Flag PokeGen::PokeMod::MapEffect::GetExistFlag() const
{
return existFlag;
}