Permalink
Browse files

Merge branch 'devel' of https://github.com/coyotte508/pokemon-online

…into devel

Conflicts:
	bin/db/pokes/5G_dw_moves.txt
	src/Server/moves.cpp
	src/Server/moves/moves1.cpp
	src/Teambuilder/client.cpp
	src/Teambuilder/pmwindow.cpp
  • Loading branch information...
2 parents 49e0d4a + f8e49c8 commit 9da1e486c01b875231cb6893f2521eb8516f88bc @lamperi lamperi committed Dec 15, 2011
@@ -35,7 +35,7 @@ function bundle_mac_app() {
fworks=$app/Contents/Frameworks
zlib=libz.1.dylib
- libzip=libzip.2.dylib
+ libzip=libzip.1.dylib
pokemonlib_long=libpokemonlib.1.0.0.dylib
pokemonlib=libpokemonlib.1.dylib
utilities_long=libutilities.1.0.0.dylib
@@ -225,10 +225,10 @@
31#Space Mail
31#Steel Mail
31#Tunnel Mail
-32-10#Aqua Cassette
-32-12#Lightning Cassette
-32-8#Blaze Cassette
-32-14#Freeze Cassette
+32-10#Douse Drive
+32-12#Shock Drive
+32-9#Burn Drive
+32-14#Chill Drive
33#Evolution Stone
@@ -116,7 +116,7 @@ All Pok
-%s snatched %f's %m!|%s waits for a target to make a move!
+%s snatched %f's move!|%s waits for a target to make a move!
Spikes were scattered all around the feet of %tf's team!|%s is hurt by spikes!
@@ -35,7 +35,8 @@
69:0 235 402
70:0 235 402
71:0 235 402
-72:0 37 202 367
+72:0 202
+73:0 202
77:0 37 257
78:0 37 257
79:0 335 362
@@ -721,4 +721,8 @@
647:0 Keldeo
648:0:H Meloetta
648:1 Meloetta-S
-649:0 Genesect
+649:0:H Genesect
+649:1 Genesect-D
+649:2 Genesect-S
+649:3 Genesect-B
+649:4 Genesect-C
View
0 bin/zip.dll 100644 → 100755
No changes.
View
0 bin/zlib1.dll 100644 → 100755
No changes.
@@ -1,7 +1,7 @@
#ifndef BATTLEENUM_H
#define BATTLEENUM_H
-enum class BattleEnum
+enum BattleEnum
{
NewHp,
Damaged,
Oops, something went wrong. Retry.

0 comments on commit 9da1e48

Please sign in to comment.