aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'kanzure/master' into mergetasticSanky2013-10-21
|\ | | | | | | | | Conflicts: main.asm
| * Fix CheckIfInOutsideMap comments.IIMarckus2013-09-25
| | | | | | | | Pointed out by 80C.
| * Merge branch 'comments' of https://github.com/dannye/pokeredIIMarckus2013-09-17
| |\
| | * Merge branch 'master' into commentsU-Fish-PC\Daniel2013-09-16
| | |\
| | | * revert pokemontools to 7aa016fbU-Fish-PC\Daniel2013-09-16
| | | |
| | | * gbz80disasm for pokered fixU-Fish-PC\Daniel2013-09-11
| | | |
| | | * Merge pull request #1 from kanzure/dannye-incbinsdannye2013-09-10
| | | |\ | | | | | | | | | | Merge so that iimarckus does less work
| | | * \ Merge branch 'comments' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-08
| | | |\ \
| | | * \ \ Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-06
| | | |\ \ \
| | | * \ \ \ Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-05
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-04
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-03
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of https://github.com/iimarckus/pokeredU-Fish-PC\Daniel2013-09-03
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'incbin'U-Fish-PC\Daniel2013-08-30
| | | |\ \ \ \ \ \ \ \
| | * | | | | | | | | | give consistency to map namesU-Fish-PC\Daniel2013-09-16
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | Split blank_leader_names and circle_tileU-Fish-PC\Daniel2013-09-08
| | | | | | | | | | |
| | * | | | | | | | | Remove INCBIN "baserom.gbc" from a commentU-Fish-PC\Daniel2013-09-06
| | |/ / / / / / / /
| * | | | | | | | / bump and support latest pokemontoolsBryan Bishop2013-09-16
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch kanzure/master into dannye-incbinsBryan Bishop2013-09-10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: extras
| | * | | | | | | | Merge pull request #3 from dannye/commentsiimarckus2013-09-04
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Add comments on bit 3 of battle status 3 to DeterminePaletteID:
| | | * | | | | | | Add comments on bit 3 of battle status 3 to DeterminePaletteID:U-Fish-PC\Daniel2013-08-28
| | | | | | | | | |
| | * | | | | | | | Merge branch 'use-pokemontools' into masterBryan Bishop2013-09-04
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: extras extras/analyze_incbins.py
| | | * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use pokemontools v1.3.0 and use the same preprocessor as the pokecrystal project.
| | | * | | | | | | 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
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge pull request #2 from dannye/masteriimarckus2013-08-21
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | uncompressed tiles
| * | | | | | | | | Add labels to recently added asmU-Fish-PC\Daniel2013-09-10
| | | | | | | | | |
| * | | | | | | | | Add misc asmU-Fish-PC\Daniel2013-09-10
| | | | | | | | | |
| * | | | | | | | | add misc asmU-Fish-PC\Daniel2013-09-10
| | | | | | | | | |
| * | | | | | | | | Include text command $0a in UnnamedText_27fb3U-Fish-PC\Daniel2013-09-10
| | | | | | | | | |
| * | | | | | | | | misc asmU-Fish-PC\Daniel2013-09-10
| | | | | | | | | |
| * | | | | | | | | Add HMMoveArrayU-Fish-PC\Daniel2013-09-10
| | | | | | | | | |
| * | | | | | | | | Add misc asmU-Fish-PC\Daniel2013-09-10
| | | | | | | | | |
| * | | | | | | | | Add UnnamedText_1ebe2U-Fish-PC\Daniel2013-09-10
| | | | | | | | | |
| * | | | | | | | | Add CinnabarGymGateCoordsU-Fish-PC\Daniel2013-09-10
| | | | | | | | | |
| * | | | | | | | | Add UnnamedText_1eae3U-Fish-PC\Daniel2013-09-10
| | | | | | | | | |
| * | | | | | | | | Add PointerTable_1ea60 and organize PointerTable labelsU-Fish-PC\Daniel2013-09-10
| | | | | | | | | |
| * | | | | | | | | un-incbin misc asmU-Fish-PC\Daniel2013-09-10
| | | | | | | | | |
| * | | | | | | | | Add UnnamedText_1e940U-Fish-PC\Daniel2013-09-10
| | | | | | | | | |
| * | | | | | | | | Add UnnamedText_1cae8U-Fish-PC\Daniel2013-09-10
| | | | | | | | | |
| * | | | | | | | | Add TownMapOrderU-Fish-PC\Daniel2013-09-10
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Add bank 1C palette packetsU-Fish-PC\Daniel2013-09-06
| | | | | | | | |
| * | | | | | | | Add UnknownText_74229U-Fish-PC\Daniel2013-09-06
| | | | | | | | |
| * | | | | | | | Add To text stringU-Fish-PC\Daniel2013-09-06
| | | | | | | | |
| * | | | | | | | Add spaces text stringU-Fish-PC\Daniel2013-09-06
| | | | | | | | |
| * | | | | | | | Organize Game Freak OAM dataU-Fish-PC\Daniel2013-09-06
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Add mon's nest text stringU-Fish-PC\Daniel2013-09-05
| | |_|_|_|_|/ | |/| | | | |