diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-04 16:14:11 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-04 16:14:11 -0400 |
| commit | ca8580ddd93f68b5911c745505e717bb1a79e14c (patch) | |
| tree | 38f8bd3ddc8e26b12f8263a1798303d7c3129c6f | |
| parent | f95b8e95a8fd4476de34e49289ee7129a8ae4bef (diff) | |
| parent | 35a578c62050893d5f347f637acbdcbbfb99f311 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | src/data/wild_encounters.json.txt | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index b481344d9..3c3abede8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,10 @@ cache: apt: true install: - pushd $HOME - - travis_retry wget https://github.com/devkitPro/buildscripts/releases/download/devkitARM_r50/devkitARM_r50-linux.tar.xz + - travis_retry wget https://github.com/devkitPro/buildscripts/releases/download/devkitARM_r52/devkitARM_r52-linux.tar.xz - tar xJf devkitARM*.tar.xz + - travis_retry wget https://github.com/devkitPro/devkitarm-rules/releases/download/v1.0.0/devkitarm-rules-1.0.0.tar.xz + - tar xJf devkitarm-rules-*.tar.xz -C $DEVKITARM - travis_retry git clone https://github.com/pret/agbcc.git - cd agbcc && sh build.sh && sh install.sh $TRAVIS_BUILD_DIR - popd 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), |