summaryrefslogtreecommitdiff
path: root/src/battle_controller_opponent.c
AgeCommit message (Collapse)Author
2019-12-14Merge branch 'master' of github.com:pret/pokeruby into modern_gccPikalaxALT
2019-10-02Merge branch 'master' into emerald_diffPikalaxALT
2019-10-02Merge branch 'master' into modern_gccPikalaxALT
2019-09-05Configure Travis to build nonmatching (#746)PikalaxALT
* Configure Travis to build nonmatching
2019-09-05Merge branch 'master' into modern_gccPikalaxALT
2019-07-31resolve more battle system differencescamthesaxman
2019-07-29gMPlay to gMPlayInfocamthesaxman
2019-07-29resolve some Emerald differencescamthesaxman
2019-07-29Merge branch 'master' into modern_gccPikalaxALT
2019-07-28emerald file names, part 1camthesaxman