aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/ |/|
| * 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
| * Add Celadon Gym city and leader textU-Fish-PC\Daniel2013-09-021-6/+6
| * Fix typo: Unknown4445D -> Unknown_4045DU-Fish-PC\Daniel2013-09-021-1/+1
| * Add stats text stringsU-Fish-PC\Daniel2013-09-021-3/+8
| * Add disabled and type textU-Fish-PC\Daniel2013-09-021-6/+6
| * Add slot machine reward valuesU-Fish-PC\Daniel2013-09-021-1/+4
| * Add Deposit/Withdraw PC textU-Fish-PC\Daniel2013-09-021-9/+9
| * Add Box No. PC textU-Fish-PC\Daniel2013-09-021-3/+3
| * Add Bill's PC menu textU-Fish-PC\Daniel2013-09-021-3/+3
| * Add PC text stringsU-Fish-PC\Daniel2013-09-021-20/+20
| * Add Unknown_1ecafU-Fish-PC\Daniel2013-09-021-1/+7
| * Add Bill's mon list textU-Fish-PC\Daniel2013-09-021-1/+1
| * Add Win/Lose text and improve SaveScreenInfoText labelU-Fish-PC\Daniel2013-09-021-11/+11
| * Add nickname text stringsU-Fish-PC\Daniel2013-09-021-12/+12
| * Add nicknaming alphabet text stringsU-Fish-PC\Daniel2013-09-021-6/+6
| * Add player info text stringsU-Fish-PC\Daniel2013-09-021-3/+6
| * Add main menu text stringsU-Fish-PC\Daniel2013-09-021-9/+9
| * Add Unknown_5ab0U-Fish-PC\Daniel2013-09-021-1/+2
| * Add PointerTable: and organize labelsU-Fish-PC\Daniel2013-09-021-8/+12
| * Add Func_5a18U-Fish-PC\Daniel2013-09-021-1/+5
| * Add Func_57f2U-Fish-PC\Daniel2013-09-021-1/+238
| * Add Func_57d6U-Fish-PC\Daniel2013-09-021-1/+10
| * Add Func_57c7U-Fish-PC\Daniel2013-09-021-1/+6
| * Add CANCEL text string and functionU-Fish-PC\Daniel2013-09-021-1/+14
| * Disassemble chunks of bank 1 near 5530U-Fish-PC\Daniel2013-09-021-3/+279
| * Merge branch 'fix-analyze-incbins' of https://github.com/kanzure/pokered into...U-Fish-PC\Daniel2013-09-011-0/+5
| |\
| | * allow commas in commentsBryan Bishop2013-06-101-0/+5
| * | Add trade text stringsU-Fish-PC\Daniel2013-09-011-1/+2