aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAge
* Merge branch 'master' of https://github.com/Sanqui/pokeyellowdannye2016-10-09
|\
| * Better names for a few Pikachu's Beach routinesSanqui2016-08-08
| * Label some Pikachu's Beach related routinesSanqui2016-08-08
* | Make it clear JessieJamesData is not explicitly referenceddannye2016-10-09
* | Fix one more Pikachu gfxeinstein952016-10-09
* | Fix some Pikachu gfxeinstein952016-10-09
* | Use emotion bubble constants in map scripts.IIMarckus2016-08-15
* | Label palettesdannye2016-08-12
* | Format sgb packetsdannye2016-08-09
|/
* Merge branch 'master' of https://github.com/pret/pokeyellowdannye2016-07-16
|\
| * Merge pull request #15 from pret/remove-pipDaniel Harding2016-07-16
| |\
| | * Remove baserom instructions.yenatch2016-06-12
| | * pip is no longer required.yenatch2016-06-11
| * | Merge pull request #17 from YamaArashi/masterYamaArashi2016-06-12
| |\ \
| | * | sync homeYamaArashi2016-06-12
| | * | sync textYamaArashi2016-06-12
| | * | remove map object addr commentsYamaArashi2016-06-12
| | * | remove map header addr commentsYamaArashi2016-06-12
| | * | sync tileset WRAM labelsYamaArashi2016-06-12
| |/ /
* | | 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