aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/pret/pokeyellowdannye2016-07-1621-150/+122
|\
| * Merge pull request #15 from pret/remove-pipDaniel Harding2016-07-161-18/+5
| |\
| | * Remove baserom instructions.yenatch2016-06-121-5/+2
| | * pip is no longer required.yenatch2016-06-111-13/+3
| * | Merge pull request #17 from YamaArashi/masterYamaArashi2016-06-12454-594/+577
| |\ \
| | * | sync homeYamaArashi2016-06-127-140/+119
| | * | sync textYamaArashi2016-06-129-7/+12
| | * | remove map object addr commentsYamaArashi2016-06-12219-219/+219
| | * | remove map header addr commentsYamaArashi2016-06-12217-218/+217
| | * | sync tileset WRAM labelsYamaArashi2016-06-123-10/+10
| |/ /
* | | Merge branch 'master' of https://github.com/pret/pokeyellow into merge-pokereddannye2016-06-1241-183/+173
|\| |
| * | Merge pull request #16 from YamaArashi/masterYamaArashi2016-06-1245-253/+236
| |\ \
| | * | more syncing with pokeredYamaArashi2016-06-122-33/+33
| | * | sync engine code with pokeredYamaArashi2016-06-1143-220/+203
| |/ /
* | | Remove more address commentsdannye2016-06-1249-363/+340
* | | Merge branch 'master' of https://github.com/pret/pokered into merge-pokereddannye2016-06-12442-476/+470
|\ \ \
| * | | Remove the last address commentsdannye2016-06-12458-791/+532
* | | | Merge branch 'master' of https://github.com/pret/pokered into merge-pokereddannye2016-06-128-17/+17
|\| | |
| * | | Remove some leftover address commentsdannye2016-06-1214-31/+31
* | | | Merge remote-tracking branch 'pokered/master' into merge-pokereddannye2016-06-120-0/+0
|\| | | | |/ / |/| |
| * | Merge pull request #133 from YamaArashi/masterYamaArashi2016-06-11766-8812/+8830
| |\ \
| | * | remove address commentsYamaArashi2016-06-11764-8371/+8371
| | * | crlf to lfYamaArashi2016-06-112-441/+459
| |/ /
| * | Implement handy text macros from yellowpikalaxalt2016-06-0917-56/+70
| * | Try again to bump extraspikalaxalt2016-06-091-0/+0
| * | Merge branch 'master' of https://github.com/pret/pokeredpikalaxalt2016-06-09200-659/+19
| |\ \
| | * | Rebump extras.yenatch2016-06-091-0/+0
| | * | Sync somewhat with pokeyellow.IIMarckus2016-06-08182-262/+18
| | * | Remove the Beach House option.IIMarckus2016-06-0720-401/+1
| * | | TX_SFX_KEY_ITEM and `mapconst` macropikalaxalt2016-05-308-1163/+276
| |/ /
| * | dbw door tilespikalaxalt2016-05-221-26/+13
| * | Finish reversion of .gb file extensionspikalaxalt2016-05-131-2/+2
| * | Remove the last remaining IF DEF(_YELLOW)pikalaxalt2016-05-131-8/+1
| * | Merge branch 'master' of https://github.com/pret/pokeredpikalaxalt2016-05-13310-2701/+1005
| |\ \
| | * | Fix typo: ninetails.asm -> ninetales.asmdannye2016-04-252-1/+1
| | * | Add a TX_MART macro for inventories.IIMarckus2016-04-082-27/+25
| | * | Clean up script labels in marts and Pokémon Centers.IIMarckus2016-04-0855-352/+322
| | * | Clean up labels and trainer headers for overworld Pokémon.IIMarckus2016-04-0616-238/+237
| | * | Clean up more Yellow ifdefs.IIMarckus2016-03-2225-319/+15
| | * | Add a farcall alias.yenatch2016-03-141-0/+2
| | * | Remove hardcoded length values in items.asmMarcus Huderle2016-02-211-2/+2
| | * | Remove hardcoded values for CopyData in battle core.Marcus Huderle2016-02-201-4/+4
| | * | Bump extras so that pypng doesn't need to be installed.yenatch2016-02-172-6/+1
| | * | Bump extras.yenatch2016-02-171-0/+0
| | * | Use rgbasm -D in the makefile.yenatch2016-02-1718-80/+31
| | * | apt-cyg died againyenatch2016-02-171-3/+2
| | * | Get rid of yellow ifdefs in wild Pokémon.IIMarckus2016-02-1259-1510/+360
| | * | Remove misleading (unreferenced) labels.IIMarckus2016-01-30151-153/+3
| * | | Split default names strings into separate lines to make it less unpleasant to...pikalaxalt2016-05-131-6/+24
| * | | Macrofy sprite status data in WRA0PikalaxALT2016-01-298-23/+102
| |/ /