dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokefirered into modern_gcc

Browse Source
This commit is contained in:
PikalaxALT
2020-04-04 16:14:11 -04:00
parent f95b8e95a8 35a578c620
commit ca8580ddd9
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+3 -1
View File
@@ -15,8 +15,10 @@ cache:
apt: true apt: true
install: install:
- pushd $HOME - 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 - 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 - travis_retry git clone https://github.com/pret/agbcc.git
- cd agbcc && sh build.sh && sh install.sh $TRAVIS_BUILD_DIR - cd agbcc && sh build.sh && sh install.sh $TRAVIS_BUILD_DIR
- popd - popd
src/data/wild_encounters.json.txt
+2 -2
View File
@@ -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 }; const struct WildPokemonInfo {{ encounter.base_label }}_FishingMonsInfo = { {{encounter.fishing_mons.encounter_rate}}, {{ encounter.base_label }}_FishingMons };
{% endif %} {% endif %}
#endif {% if contains(encounter.base_label, "FireRed") or contains(encounter.base_label, "LeafGreen") %}#endif{% endif %}
## endfor ## 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 %}, .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 %}, .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 ## endfor
{ {
.mapGroup = MAP_GROUP(UNDEFINED), .mapGroup = MAP_GROUP(UNDEFINED),