aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge branch 'music' of https://github.com/dannye/pokeredIIMarckus2013-10-30
|\
| * typoU-Fish-PC\Daniel2013-10-24
| |
| * Add MapSongBanks:U-Fish-PC\Daniel2013-10-24
| |
| * Music Engine Bank 8U-Fish-PC\Daniel2013-10-24
| |
| * Music Engine Bank 1fU-Fish-PC\Daniel2013-10-23
| |
| * Noise_endchannel:U-Fish-PC\Daniel2013-10-22
| |
| * Add unused sfxU-Fish-PC\Daniel2013-10-22
| |
| * Fix sfx_02_5eU-Fish-PC\Daniel2013-10-22
| |
| * Fix blue and yellow musicU-Fish-PC\Daniel2013-10-22
| |
| * More bank 2 music engine and music/sfx format updateU-Fish-PC\Daniel2013-10-21
| |
| * More music engine labels and commentsU-Fish-PC\Daniel2013-10-19
| |
| * More music engine labelsU-Fish-PC\Daniel2013-10-18
| |
| * Some music engine labelsU-Fish-PC\Daniel2013-10-18
| |
* | Improve comments.IIMarckus2013-10-17
| |
* | Merge pull request #11 from dannye/musiciimarckus2013-10-13
|\| | | | | Music
| * Add song alternate start labelsU-Fish-PC\Daniel2013-10-14
| |
| * Update submoduleU-Fish-PC\Daniel2013-10-13
| |
| * All music and sfxU-Fish-PC\Daniel2013-10-12
| |
| * Merge remote-tracking branch 'kanzure/use-new-preprocessor'U-Fish-PC\Daniel2013-09-16
| |\
| * \ Merge branch 'comments'U-Fish-PC\Daniel2013-09-16
| |\ \
* | | | 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
| | | | | | | | |