aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch kanzure/master into dannye-incbinsBryan Bishop2013-09-1031-6217/+22
|\
| * Merge pull request #3 from dannye/commentsiimarckus2013-09-041-2/+2
| |\
| | * Add comments on bit 3 of battle status 3 to DeterminePaletteID:U-Fish-PC\Daniel2013-08-281-2/+2
| * | Merge branch 'use-pokemontools' into masterBryan Bishop2013-09-0431-6215/+20
| |\ \
| | * | make pokeblue.gbc compile againBryan Bishop2013-09-041-1/+1
| | * | bump submodule to get a gbz80disasm fixBryan Bishop2013-09-011-0/+0
| | * | make extras/ a submoduleBryan Bishop2013-09-0130-6207/+17
| | * | compile with preprocessor outputsBryan Bishop2013-08-311-3/+3
| | * | fix capitalization on a SECTIONBryan Bishop2013-08-311-1/+1
| * | | Merge branch 'incbin' of https://github.com/dannye/pokered into dannye-incbinIIMarckus2013-09-022-184/+885
| |\ \ \ | | |/ / | |/| |
| * | | Merge pull request #2 from dannye/masteriimarckus2013-08-2137-112/+113
| |\ \ \ | | | |/ | | |/|
* | | | Add labels to recently added asmU-Fish-PC\Daniel2013-09-101-3/+4
* | | | Add misc asmU-Fish-PC\Daniel2013-09-101-1/+18
* | | | add misc asmU-Fish-PC\Daniel2013-09-101-1/+23
* | | | Include text command $0a in UnnamedText_27fb3U-Fish-PC\Daniel2013-09-101-4/+2
* | | | misc asmU-Fish-PC\Daniel2013-09-101-3/+53
* | | | Add HMMoveArrayU-Fish-PC\Daniel2013-09-101-3/+8
* | | | Add misc asmU-Fish-PC\Daniel2013-09-101-1/+53
* | | | Add UnnamedText_1ebe2U-Fish-PC\Daniel2013-09-101-2/+5
* | | | Add CinnabarGymGateCoordsU-Fish-PC\Daniel2013-09-101-3/+15
* | | | Add UnnamedText_1eae3U-Fish-PC\Daniel2013-09-101-4/+7
* | | | Add PointerTable_1ea60 and organize PointerTable labelsU-Fish-PC\Daniel2013-09-101-10/+15
* | | | un-incbin misc asmU-Fish-PC\Daniel2013-09-101-3/+17
* | | | Add UnnamedText_1e940U-Fish-PC\Daniel2013-09-101-4/+5
* | | | Add UnnamedText_1cae8U-Fish-PC\Daniel2013-09-101-5/+6
* | | | Add TownMapOrderU-Fish-PC\Daniel2013-09-101-3/+49
* | | | Add bank 1C palette packetsU-Fish-PC\Daniel2013-09-061-51/+59
* | | | Add UnknownText_74229U-Fish-PC\Daniel2013-09-061-3/+4
* | | | Add To text stringU-Fish-PC\Daniel2013-09-061-3/+3
* | | | Add spaces text stringU-Fish-PC\Daniel2013-09-061-3/+3
* | | | Organize Game Freak OAM dataU-Fish-PC\Daniel2013-09-061-5/+20
* | | | Add mon's nest text stringU-Fish-PC\Daniel2013-09-051-3/+3
* | | | Add two safari text stringsU-Fish-PC\Daniel2013-09-041-6/+6
* | | | Add Game Freak intro OAM dataU-Fish-PC\Daniel2013-09-031-6/+9
| |_|/ |/| |
* | | Update labels for consistencyU-Fish-PC\Daniel2013-09-021-22/+22
* | | Add box names and Box No. textU-Fish-PC\Daniel2013-09-021-6/+17
* | | Add Area Unknown textU-Fish-PC\Daniel2013-09-021-3/+3
* | | Add Hall of Fame player info textU-Fish-PC\Daniel2013-09-021-6/+6
* | | Add Hall of Fame mon info text stringsU-Fish-PC\Daniel2013-09-021-3/+3
* | | Add Hall of Fame text stringU-Fish-PC\Daniel2013-09-021-3/+3
* | | Add Unknown_5ddefU-Fish-PC\Daniel2013-09-021-1/+4
* | | Add status ailment text and PointerTable5dccU-Fish-PC\Daniel2013-09-021-1/+14
* | | Add HowToLink text strings and pointer tableU-Fish-PC\Daniel2013-09-021-4/+70
* | | Add Saffron Gym city and leader textU-Fish-PC\Daniel2013-09-021-6/+6
* | | Add Vermilion Gym city and leader textU-Fish-PC\Daniel2013-09-021-6/+6
* | | Add Cerulean Gym city and leader textU-Fish-PC\Daniel2013-09-021-6/+6
* | | Add Pewter Gym city and leader textU-Fish-PC\Daniel2013-09-021-6/+6
* | | Add diploma text strings and coordsU-Fish-PC\Daniel2013-09-021-3/+27
* | | Add badge text string listU-Fish-PC\Daniel2013-09-021-1/+10
* | | Add Game Corner coin-purchasing text stringsU-Fish-PC\Daniel2013-09-021-12/+12