summaryrefslogtreecommitdiff
path: root/src/map/battle.h
diff options
context:
space:
mode:
authorDastgir Pojee <dastgirpojee@rocketmail.com>2013-10-17 21:39:11 +0530
committerDastgir Pojee <dastgirpojee@rocketmail.com>2013-10-17 21:39:11 +0530
commitb2c9f9de564065019684fcf22ed020b943fc5bbe (patch)
treed27ede8e334382211743c1e34a73a9db67778d38 /src/map/battle.h
parent97979fe1e577aebe77e978c248a08b33b2c0c1a2 (diff)
parent9128feccf3bddda94a7f8a170305565416815b40 (diff)
downloadhercules-b2c9f9de564065019684fcf22ed020b943fc5bbe.tar.gz
hercules-b2c9f9de564065019684fcf22ed020b943fc5bbe.tar.bz2
hercules-b2c9f9de564065019684fcf22ed020b943fc5bbe.tar.xz
hercules-b2c9f9de564065019684fcf22ed020b943fc5bbe.zip
Merge remote-tracking branch 'upstream/master' into SkidConst
Diffstat (limited to 'src/map/battle.h')
-rw-r--r--src/map/battle.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/battle.h b/src/map/battle.h
index 533fa40b0..1aa07b2be 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -463,6 +463,8 @@ struct Battle_Config {
int feature_banking;
int feature_auction;
+
+ int mon_trans_disable_in_gvg;
} battle_config;
// Dammage delayed info