diff options
| author | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
| commit | 2c14d6ee6c40f4b7e5cd9366080ce911d67be718 (patch) | |
| tree | 4a70ca275a2f161d2d23f63d0608f92d8ea08acb /src/data/battle_frontier | |
| parent | d6a88e0eaa7d74f187fb27f8a376203f40537340 (diff) | |
| parent | d9a5de5317d4589b139f9532a7e8bf3b851e673f (diff) | |
fix merge conflicts
Diffstat (limited to 'src/data/battle_frontier')
| -rw-r--r-- | src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h | 1 | ||||
| -rw-r--r-- | src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h index 50bc1c856..108b3a3b0 100644 --- a/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h +++ b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h @@ -1,4 +1,3 @@ - static const struct PyramidWildMon sLevel50WildMons_Round1[] = { { diff --git a/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h index 6409e73b1..10435d767 100644 --- a/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h +++ b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h @@ -1,4 +1,3 @@ - static const struct PyramidWildMon sOpenLevelWildMons_Round1[] = { { |