749225ace1
# Conflicts: # graphics/interface/menu_info.png # include/pokemon.h # src/battle_ai_switch_items.c # src/battle_anim_mons.c # src/battle_anim_water.c # src/battle_controller_opponent.c # src/battle_gfx_sfx_util.c # src/battle_main.c # src/battle_pike.c # src/battle_script_commands.c # src/data/pokemon/species_info.h # src/pokemon.c # src/pokemon_summary_screen.c |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| convert_png.c | ||
| convert_png.h | ||
| font.c | ||
| font.h | ||
| gfx.c | ||
| gfx.h | ||
| global.h | ||
| huff.c | ||
| huff.h | ||
| jasc_pal.c | ||
| jasc_pal.h | ||
| LICENSE | ||
| lz.c | ||
| lz.h | ||
| main.c | ||
| Makefile | ||
| options.h | ||
| rl.c | ||
| rl.h | ||
| util.c | ||
| util.h | ||