aboutsummaryrefslogtreecommitdiffstats
path: root/main.asm (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1 from kanzure/dannye-incbinsdannye2013-09-101-48/+278
|\
| * Merge branch kanzure/master into dannye-incbinsBryan Bishop2013-09-101-3/+3
| |\
| | * Merge pull request #3 from dannye/commentsiimarckus2013-09-041-2/+2
| | |\
| | * \ Merge branch 'use-pokemontools' into masterBryan Bishop2013-09-041-1/+1
| | |\ \
| | | * | fix capitalization on a SECTIONBryan Bishop2013-08-311-1/+1
| * | | | 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
* | | | | Merge branch 'comments' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-081-8/+5
|\ \ \ \ \
| * | | | | Split blank_leader_names and circle_tileU-Fish-PC\Daniel2013-09-081-3/+5
| * | | | | Remove INCBIN "baserom.gbc" from a commentU-Fish-PC\Daniel2013-09-061-5/+0
| | |_|_|/ | |/| | |
* | | | | Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-061-65/+89
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | | | | Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-051-3/+3
|\| | | |
| * | | | Add mon's nest text stringU-Fish-PC\Daniel2013-09-051-3/+3
* | | | | Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-041-6/+6
|\| | | |
| * | | | Add two safari text stringsU-Fish-PC\Daniel2013-09-041-6/+6
* | | | | Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-031-6/+9
|\| | | |
| * | | | Add Game Freak intro OAM dataU-Fish-PC\Daniel2013-09-031-6/+9
| | |/ / | |/| |
* | | | Merge branch 'master' of https://github.com/iimarckus/pokeredU-Fish-PC\Daniel2013-09-031-181/+877
|\| | |
| * | | 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