Age | Commit message (Collapse) | Author | |
---|---|---|---|
2014-09-23 | Accidentally committed .orig files from merge dff0cdeb. | yenatch | |
2014-09-20 | Merge remote-tracking branch 'YamaArashi/master' | yenatch | |
Conflicts: constants/misc_constants.asm engine/battle/core.asm engine/menu/pokedex.asm engine/town_map.asm home.asm hram.asm |