diff options
| author | Haru <haru@dotalux.com> | 2017-05-09 03:09:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-09 03:09:58 +0200 |
| commit | 9695eacf9c8bcec0093735dd3dc913fea99213b9 (patch) | |
| tree | 7bc08f6a8e69463f324efda3f6bef47100ff091b /src/map/battle.c | |
| parent | 9a8c572b4a53318a40d9fe23344666ab7a2a4210 (diff) | |
| parent | 359cc8da6b98c9716e4695b471acbe4d45140be2 (diff) | |
| download | hercules-9695eacf9c8bcec0093735dd3dc913fea99213b9.tar.gz hercules-9695eacf9c8bcec0093735dd3dc913fea99213b9.tar.bz2 hercules-9695eacf9c8bcec0093735dd3dc913fea99213b9.tar.xz hercules-9695eacf9c8bcec0093735dd3dc913fea99213b9.zip | |
Merge pull request #1699 from Jedzkie/11-SummerCostume
Implemented Official Summer 2 Costume
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 921e8bbd3..11425d4a9 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -7041,6 +7041,8 @@ static const struct battle_data { { "xmas_ignorepalette", &battle_config.xmas_ignorepalette, 0, 0, 1, }, { "summer_ignorepalette", &battle_config.summer_ignorepalette, 0, 0, 1, }, { "hanbok_ignorepalette", &battle_config.hanbok_ignorepalette, 0, 0, 1, }, + { "oktoberfest_ignorepalette", &battle_config.oktoberfest_ignorepalette, 0, 0, 1, }, + { "summer2_ignorepalette", &battle_config.summer2_ignorepalette, 0, 0, 1, }, { "natural_healhp_interval", &battle_config.natural_healhp_interval, 6000, NATURAL_HEAL_INTERVAL, INT_MAX, }, { "natural_healsp_interval", &battle_config.natural_healsp_interval, 8000, NATURAL_HEAL_INTERVAL, INT_MAX, }, { "natural_heal_skill_interval", &battle_config.natural_heal_skill_interval, 10000, NATURAL_HEAL_INTERVAL, INT_MAX, }, |