aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11 from dannye/musiciimarckus2013-10-13421-16331/+40511
|\
| * Add song alternate start labelsU-Fish-PC\Daniel2013-10-142-6/+8
| * Update submoduleU-Fish-PC\Daniel2013-10-131-0/+0
| * All music and sfxU-Fish-PC\Daniel2013-10-12420-16331/+40509
| * Merge remote-tracking branch 'kanzure/use-new-preprocessor'U-Fish-PC\Daniel2013-09-162-3/+4
| |\
| * \ Merge branch 'comments'U-Fish-PC\Daniel2013-09-1642-71/+71
| |\ \
* | | | Fix CheckIfInOutsideMap comments.IIMarckus2013-09-251-5/+4
* | | | Merge branch 'comments' of https://github.com/dannye/pokeredIIMarckus2013-09-1745-80/+77
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Merge branch 'master' into commentsU-Fish-PC\Daniel2013-09-1632-6512/+1275
| |\|
| | * revert pokemontools to 7aa016fbU-Fish-PC\Daniel2013-09-162-1/+1
| | * gbz80disasm for pokered fixU-Fish-PC\Daniel2013-09-111-0/+0
| | * Merge pull request #1 from kanzure/dannye-incbinsdannye2013-09-1031-6262/+297
| | |\
| | * \ Merge branch 'comments' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-083-8/+5
| | |\ \
| | * \ \ Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-061-65/+89
| | |\ \ \
| | * \ \ \ Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-051-3/+3
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-041-6/+6
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'incbin' of https://github.com/dannye/pokeredU-Fish-PC\Daniel2013-09-031-6/+9
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of https://github.com/iimarckus/pokeredU-Fish-PC\Daniel2013-09-032-181/+882
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'incbin'U-Fish-PC\Daniel2013-08-301-3/+3
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | give consistency to map namesU-Fish-PC\Daniel2013-09-1642-71/+71
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Split blank_leader_names and circle_tileU-Fish-PC\Daniel2013-09-083-3/+5
| * | | | | | | | | Remove INCBIN "baserom.gbc" from a commentU-Fish-PC\Daniel2013-09-061-5/+0
| |/ / / / / / / /
* | | | | | | | / bump and support latest pokemontoolsBryan Bishop2013-09-162-3/+4
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch kanzure/master into dannye-incbinsBryan Bishop2013-09-1031-6217/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge pull request #3 from dannye/commentsiimarckus2013-09-041-2/+2
| |\| | | | | | |
| | * | | | | | | Add comments on bit 3 of battle status 3 to DeterminePaletteID:U-Fish-PC\Daniel2013-08-281-2/+2
| * | | | | | | | 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
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #2 from dannye/masteriimarckus2013-08-2137-112/+113
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | 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
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Add bank 1C palette packetsU-Fish-PC\Daniel2013-09-061-51/+59