summaryrefslogtreecommitdiff
path: root/main.asm
AgeCommit message (Collapse)Author
2013-09-10Merge pull request #1 from kanzure/dannye-incbinsdannye
Merge so that iimarckus does less work
2013-09-10Merge branch kanzure/master into dannye-incbinsBryan Bishop
Conflicts: extras
2013-09-10Add labels to recently added asmU-Fish-PC\Daniel
2013-09-10Add misc asmU-Fish-PC\Daniel
2013-09-10add misc asmU-Fish-PC\Daniel
2013-09-10Include text command $0a in UnnamedText_27fb3U-Fish-PC\Daniel
2013-09-10misc asmU-Fish-PC\Daniel
2013-09-10Add HMMoveArrayU-Fish-PC\Daniel
2013-09-10Add misc asmU-Fish-PC\Daniel
2013-09-10Add UnnamedText_1ebe2U-Fish-PC\Daniel
2013-09-10Add CinnabarGymGateCoordsU-Fish-PC\Daniel
2013-09-10Add UnnamedText_1eae3U-Fish-PC\Daniel
2013-09-10Add PointerTable_1ea60 and organize PointerTable labelsU-Fish-PC\Daniel
2013-09-10un-incbin misc asmU-Fish-PC\Daniel
2013-09-10Add UnnamedText_1e940U-Fish-PC\Daniel
2013-09-10Add UnnamedText_1cae8U-Fish-PC\Daniel
2013-09-10Add TownMapOrderU-Fish-PC\Daniel
2013-09-08Merge branch 'comments' of https://github.com/dannye/pokeredU-Fish-PC\Daniel
2013-09-08Split blank_leader_names and circle_tileU-Fish-PC\Daniel
2013-09-06Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel
2013-09-06Add bank 1C palette packetsU-Fish-PC\Daniel
2013-09-06Add UnknownText_74229U-Fish-PC\Daniel
2013-09-06Add To text stringU-Fish-PC\Daniel
2013-09-06Add spaces text stringU-Fish-PC\Daniel
2013-09-06Remove INCBIN "baserom.gbc" from a commentU-Fish-PC\Daniel
2013-09-06Organize Game Freak OAM dataU-Fish-PC\Daniel
2013-09-05Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel
2013-09-05Add mon's nest text stringU-Fish-PC\Daniel
2013-09-04Merge pull request #3 from dannye/commentsiimarckus
Add comments on bit 3 of battle status 3 to DeterminePaletteID:
2013-09-04Merge branch 'use-pokemontools' into masterBryan Bishop
Conflicts: extras extras/analyze_incbins.py
2013-09-04Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel
2013-09-04Add two safari text stringsU-Fish-PC\Daniel
2013-09-03Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel
2013-09-03Add Game Freak intro OAM dataU-Fish-PC\Daniel
2013-09-03Merge branch 'master' of https://github.com/iimarckus/pokeredU-Fish-PC\Daniel
2013-09-02Update labels for consistencyU-Fish-PC\Daniel
2013-09-02Add box names and Box No. textU-Fish-PC\Daniel
2013-09-02Add Area Unknown textU-Fish-PC\Daniel
2013-09-02Add Hall of Fame player info textU-Fish-PC\Daniel
2013-09-02Add Hall of Fame mon info text stringsU-Fish-PC\Daniel
2013-09-02Add Hall of Fame text stringU-Fish-PC\Daniel
2013-09-02Add Unknown_5ddefU-Fish-PC\Daniel
2013-09-02Add status ailment text and PointerTable5dccU-Fish-PC\Daniel
2013-09-02Add HowToLink text strings and pointer tableU-Fish-PC\Daniel
2013-09-02Add Saffron Gym city and leader textU-Fish-PC\Daniel
2013-09-02Add Vermilion Gym city and leader textU-Fish-PC\Daniel
2013-09-02Add Cerulean Gym city and leader textU-Fish-PC\Daniel
2013-09-02Add Pewter Gym city and leader textU-Fish-PC\Daniel
2013-09-02Add diploma text strings and coordsU-Fish-PC\Daniel
2013-09-02Add badge text string listU-Fish-PC\Daniel