diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-04 12:54:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-04 12:54:16 -0400 |
| commit | feede54edda623b28bbca273318885ecc6d21326 (patch) | |
| tree | 7fb6b33da134bf0202b93fff782f04557c4e1497 /src | |
| parent | c47eca8a182a2a202cd65e2af93e9ef322d8674c (diff) | |
| parent | 791e30c90b9bcf7a6c1b21291601ddcdf2f485db (diff) | |
Merge pull request #319 from garakmon/encounterinjafix
Fix encounter groups with neither a FireRed nor LeafGreen label
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/wild_encounters.json.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/data/wild_encounters.json.txt b/src/data/wild_encounters.json.txt index a05639d2a..b63f6ee47 100644 --- a/src/data/wild_encounters.json.txt +++ b/src/data/wild_encounters.json.txt @@ -66,7 +66,7 @@ const struct WildPokemon {{ encounter.base_label }}_FishingMons[] = const struct WildPokemonInfo {{ encounter.base_label }}_FishingMonsInfo = { {{encounter.fishing_mons.encounter_rate}}, {{ encounter.base_label }}_FishingMons }; {% endif %} -#endif +{% if contains(encounter.base_label, "FireRed") or contains(encounter.base_label, "LeafGreen") %}#endif{% endif %} ## endfor @@ -83,7 +83,7 @@ const struct WildPokemonHeader {{ wild_encounter_group.label }}[] = .rockSmashMonsInfo = {% if existsIn(encounter, "rock_smash_mons") %}&{{ encounter.base_label }}_RockSmashMonsInfo{% else %}NULL{% endif %}, .fishingMonsInfo = {% if existsIn(encounter, "fishing_mons") %}&{{ encounter.base_label }}_FishingMonsInfo{% else %}NULL{% endif %}, }, -#endif +{% if contains(encounter.base_label, "FireRed") or contains(encounter.base_label, "LeafGreen") %}#endif{% endif %} ## endfor { .mapGroup = MAP_GROUP(UNDEFINED), |