9917f5cc8b
# Conflicts: # Makefile # include/constants/pokemon.h # include/pokemon.h # make_tools.mk # src/battle_ai_script_commands.c # src/battle_controllers.c # src/battle_main.c # src/battle_script_commands.c # src/party_menu.c # src/pokemon.c # src/trade.c # src/trainer_pokemon_sprites.c |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| asm_file.cpp | ||
| asm_file.h | ||
| c_file.cpp | ||
| c_file.h | ||
| LICENSE | ||
| Makefile | ||
| scaninc.cpp | ||
| scaninc.h | ||
| source_file.cpp | ||
| source_file.h | ||