aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAge
* Merge branch 'use-pokemontools' into masterBryan Bishop2013-09-04
|\
| * make pokeblue.gbc compile againBryan Bishop2013-09-04
| * bump submodule to get a gbz80disasm fixBryan Bishop2013-09-01
| * make extras/ a submoduleBryan Bishop2013-09-01
| * compile with preprocessor outputsBryan Bishop2013-08-31
| * fix capitalization on a SECTIONBryan Bishop2013-08-31
* | Merge branch 'incbin' of https://github.com/dannye/pokered into dannye-incbinIIMarckus2013-09-02
|\ \ | |/ |/|
| * Update labels for consistencyU-Fish-PC\Daniel2013-09-02
| * Add box names and Box No. textU-Fish-PC\Daniel2013-09-02
| * Add Area Unknown textU-Fish-PC\Daniel2013-09-02
| * Add Hall of Fame player info textU-Fish-PC\Daniel2013-09-02
| * Add Hall of Fame mon info text stringsU-Fish-PC\Daniel2013-09-02
| * Add Hall of Fame text stringU-Fish-PC\Daniel2013-09-02
| * Add Unknown_5ddefU-Fish-PC\Daniel2013-09-02
| * Add status ailment text and PointerTable5dccU-Fish-PC\Daniel2013-09-02
| * Add HowToLink text strings and pointer tableU-Fish-PC\Daniel2013-09-02
| * Add Saffron Gym city and leader textU-Fish-PC\Daniel2013-09-02
| * Add Vermilion Gym city and leader textU-Fish-PC\Daniel2013-09-02
| * Add Cerulean Gym city and leader textU-Fish-PC\Daniel2013-09-02
| * Add Pewter Gym city and leader textU-Fish-PC\Daniel2013-09-02
| * Add diploma text strings and coordsU-Fish-PC\Daniel2013-09-02
| * Add badge text string listU-Fish-PC\Daniel2013-09-02
| * Add Game Corner coin-purchasing text stringsU-Fish-PC\Daniel2013-09-02
| * Add Celadon Gym city and leader textU-Fish-PC\Daniel2013-09-02
| * Fix typo: Unknown4445D -> Unknown_4045DU-Fish-PC\Daniel2013-09-02
| * Add stats text stringsU-Fish-PC\Daniel2013-09-02
| * Add disabled and type textU-Fish-PC\Daniel2013-09-02
| * Add slot machine reward valuesU-Fish-PC\Daniel2013-09-02
| * Add Deposit/Withdraw PC textU-Fish-PC\Daniel2013-09-02
| * Add Box No. PC textU-Fish-PC\Daniel2013-09-02
| * Add Bill's PC menu textU-Fish-PC\Daniel2013-09-02
| * Add PC text stringsU-Fish-PC\Daniel2013-09-02
| * Add Unknown_1ecafU-Fish-PC\Daniel2013-09-02
| * Add Bill's mon list textU-Fish-PC\Daniel2013-09-02
| * Add Win/Lose text and improve SaveScreenInfoText labelU-Fish-PC\Daniel2013-09-02
| * Add nickname text stringsU-Fish-PC\Daniel2013-09-02
| * Add nicknaming alphabet text stringsU-Fish-PC\Daniel2013-09-02
| * Add player info text stringsU-Fish-PC\Daniel2013-09-02
| * Add main menu text stringsU-Fish-PC\Daniel2013-09-02
| * Add Unknown_5ab0U-Fish-PC\Daniel2013-09-02
| * Add PointerTable: and organize labelsU-Fish-PC\Daniel2013-09-02
| * Add Func_5a18U-Fish-PC\Daniel2013-09-02
| * Add Func_57f2U-Fish-PC\Daniel2013-09-02
| * Add Func_57d6U-Fish-PC\Daniel2013-09-02
| * Add Func_57c7U-Fish-PC\Daniel2013-09-02
| * Add CANCEL text string and functionU-Fish-PC\Daniel2013-09-02
| * Disassemble chunks of bank 1 near 5530U-Fish-PC\Daniel2013-09-02
| * Merge branch 'fix-analyze-incbins' of https://github.com/kanzure/pokered into...U-Fish-PC\Daniel2013-09-01
| |\
| | * allow commas in commentsBryan Bishop2013-06-10
| * | Add trade text stringsU-Fish-PC\Daniel2013-09-01