mirror of
https://github.com/pret/pokeemerald.git
synced 2026-04-08 02:27:29 -05:00
# Conflicts: # src/battle_util.c # src/data/pokemon/species_info/gen_7_families.h # test/battle/ability/download.c # test/battle/ability/intimidate.c # test/battle/ability/supreme_overlord.c # test/battle/ability/zero_to_hero.c # test/battle/ai/ai.c # test/battle/move_effect/plasma_fists.c |
||
|---|---|---|
| .. | ||
| aif2pcm | ||
| bin2c | ||
| gbafix | ||
| gbagfx | ||
| jsonproc | ||
| learnset_helpers | ||
| mapjson | ||
| mgba | ||
| mgba-rom-test-hydra | ||
| mid2agb | ||
| patchelf | ||
| preproc | ||
| ramscrgen | ||
| rsfont | ||
| scaninc | ||
| trainerproc | ||