From 791e30c90b9bcf7a6c1b21291601ddcdf2f485db Mon Sep 17 00:00:00 2001 From: garakmon Date: Fri, 3 Apr 2020 15:04:49 -0400 Subject: fix encounter groups with neither a FireRed or LeafGreen label --- src/data/wild_encounters.json.txt | 4 ++-- 1 file 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), -- cgit v1.2.3 From 80bb304365a54d587e38e54ac07b4ec33504973a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 4 Apr 2020 15:46:55 -0400 Subject: Bump devkitARM to r52 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 03be7612f..f4fc29652 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ 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 git clone https://github.com/pret/agbcc.git - cd agbcc && sh build.sh && sh install.sh $TRAVIS_BUILD_DIR -- cgit v1.2.3 From 143758d57be5c745818527b3868a5bb531c4bd84 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 4 Apr 2020 16:02:40 -0400 Subject: Travis: Get devkitarm-rules --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index f4fc29652..277998ed8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ install: - pushd $HOME - 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 -- cgit v1.2.3