aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAge
* Merge branch 'master' of https://github.com/pret/pokeyellow into merge-pokereddannye2016-06-12
|\
| * Merge pull request #16 from YamaArashi/masterYamaArashi2016-06-12
| |\
| | * more syncing with pokeredYamaArashi2016-06-12
| | * sync engine code with pokeredYamaArashi2016-06-11
| |/
* | Remove more address commentsdannye2016-06-12
* | Merge branch 'master' of https://github.com/pret/pokered into merge-pokereddannye2016-06-12
|\ \
| * | Remove the last address commentsdannye2016-06-12
* | | Merge branch 'master' of https://github.com/pret/pokered into merge-pokereddannye2016-06-12
|\| |
| * | Remove some leftover address commentsdannye2016-06-12
* | | Merge remote-tracking branch 'pokered/master' into merge-pokereddannye2016-06-12
|\| | | |/ |/|
| * Merge pull request #133 from YamaArashi/masterYamaArashi2016-06-11
| |\
| | * remove address commentsYamaArashi2016-06-11
| | * crlf to lfYamaArashi2016-06-11
| |/
| * Implement handy text macros from yellowpikalaxalt2016-06-09
| * Try again to bump extraspikalaxalt2016-06-09
| * Merge branch 'master' of https://github.com/pret/pokeredpikalaxalt2016-06-09
| |\
| | * Rebump extras.yenatch2016-06-09
| | * Sync somewhat with pokeyellow.IIMarckus2016-06-08
| | * Remove the Beach House option.IIMarckus2016-06-07
| * | TX_SFX_KEY_ITEM and `mapconst` macropikalaxalt2016-05-30
| |/
| * dbw door tilespikalaxalt2016-05-22
| * Finish reversion of .gb file extensionspikalaxalt2016-05-13
| * Remove the last remaining IF DEF(_YELLOW)pikalaxalt2016-05-13
| * Merge branch 'master' of https://github.com/pret/pokeredpikalaxalt2016-05-13
| |\
| | * Fix typo: ninetails.asm -> ninetales.asmdannye2016-04-25
| | * Add a TX_MART macro for inventories.IIMarckus2016-04-08
| | * Clean up script labels in marts and Pokémon Centers.IIMarckus2016-04-08
| | * Clean up labels and trainer headers for overworld Pokémon.IIMarckus2016-04-06
| | * Clean up more Yellow ifdefs.IIMarckus2016-03-22
| | * Add a farcall alias.yenatch2016-03-14
| | * Remove hardcoded length values in items.asmMarcus Huderle2016-02-21
| | * Remove hardcoded values for CopyData in battle core.Marcus Huderle2016-02-20
| | * Bump extras so that pypng doesn't need to be installed.yenatch2016-02-17
| | * Bump extras.yenatch2016-02-17
| | * Use rgbasm -D in the makefile.yenatch2016-02-17
| | * apt-cyg died againyenatch2016-02-17
| | * Get rid of yellow ifdefs in wild Pokémon.IIMarckus2016-02-12
| | * Remove misleading (unreferenced) labels.IIMarckus2016-01-30
| * | Split default names strings into separate lines to make it less unpleasant to...pikalaxalt2016-05-13
| * | Macrofy sprite status data in WRA0PikalaxALT2016-01-29
| |/
| * Fix logically incorrect labeldannye2016-01-27
| * fix typoesYamaArashi2016-01-09
| * Merge pull request #121 from PikalaxALT/masterDaniel Harding2016-01-06
| |\
| | * Fix a typoPikalaxALT2016-01-05
| |/
| * Merge pull request #120 from PikalaxALT/masterluckytyphlosion2016-01-03
| |\
| | * Fix game time labelsPikalaxALT2016-01-03
| |/
| * Label elite four scripts more completely.Marcus Huderle2015-12-18
| * Fewer underscores in constantsdannye2015-12-14
| * Define text banks relative to the first one. Clean up address comments.IIMarckus2015-12-06
| * vertical space is cheap. also remove address comments and yellow ifs.IIMarckus2015-12-06