aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* include globals.asm in rgbasm objectsyenatch2013-12-072-0/+2
* INCLUDE .asm instead of .txyenatch2013-12-071-381/+381
* prequeue: less wasteful stdout reroutingyenatch2013-12-072-6/+11
* handle preprocessing in one python procress; export asm labelsyenatch2013-12-074-19/+74
* bump pokemontools to support makefile changesyenatch2013-12-061-0/+0
* map/symfiles in .gitignoreyenatch2013-12-061-7/+8
* rewrite the makefile to be consistent with pokecrystalyenatch2013-12-061-17/+39
* rename textpre.py -> preprocessor.pyyenatch2013-12-052-1/+1
* clean up remaining constantsyenatch2013-12-051-41/+41
* split related constants into constants/yenatch2013-12-0510-1933/+1936
* split rgbasm macros into macros.asmyenatch2013-12-052-259/+266
* split wram/hram out of constants.asm and start using wram sectionsyenatch2013-12-054-2294/+2455
* Merge branch 'master' of https://github.com/Sanky/pokeredIIMarckus2013-11-012-151/+171
|\
| * Merge remote-tracking branch 'kanzure/master' into mergetasticSanky2013-10-21115-22703/+51301
| |\
| * | AskForMonNicknameSanky2013-07-041-4/+56
| * | FaintEnemyPokemonSanky2013-07-041-4/+114
| * | Disasm code which draws tiny party pokémon symbols in-battle.Sanky2013-07-032-1/+102
| * | Some Bill's PC stuffSanky2013-07-011-40/+200
* | | All INCBIN baserom.gbcs begin with \n and all INCBINs of gfx etc begin with \tU-Fish-PC\Daniel2013-11-011-34/+34
* | | Merge branch 'master' of https://github.com/iimarckus/pokeredU-Fish-PC\Daniel2013-10-31427-17299/+35960
|\ \ \
| * \ \ Merge branch 'music' of https://github.com/dannye/pokeredIIMarckus2013-10-30370-10549/+5033
| |\ \ \
| | * | | typoU-Fish-PC\Daniel2013-10-241-1/+1
| | * | | Add MapSongBanks:U-Fish-PC\Daniel2013-10-241-3/+499
| | * | | Music Engine Bank 8U-Fish-PC\Daniel2013-10-245-511/+656
| | * | | Music Engine Bank 1fU-Fish-PC\Daniel2013-10-232-589/+669
| | * | | Noise_endchannel:U-Fish-PC\Daniel2013-10-221-55/+55
| | * | | Add unused sfxU-Fish-PC\Daniel2013-10-222-3/+33
| | * | | Fix sfx_02_5eU-Fish-PC\Daniel2013-10-221-3/+6
| | * | | Fix blue and yellow musicU-Fish-PC\Daniel2013-10-224-64/+31
| | * | | More bank 2 music engine and music/sfx format updateU-Fish-PC\Daniel2013-10-21362-9139/+2899
| | * | | More music engine labels and commentsU-Fish-PC\Daniel2013-10-191-200/+184
| | * | | More music engine labelsU-Fish-PC\Daniel2013-10-181-46/+49
| | * | | Some music engine labelsU-Fish-PC\Daniel2013-10-181-177/+193
| * | | | Improve comments.IIMarckus2013-10-171-1/+2
| * | | | 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
| * | | Fix CheckIfInOutsideMap comments.IIMarckus2013-09-251-5/+4
| * | | Merge branch 'comments' of https://github.com/dannye/pokeredIIMarckus2013-09-1745-80/+77
| |\ \ \
* | | | | Remove redundant addresses and 'known jump sources'U-Fish-PC\Daniel2013-10-251-5470/+122
* | | | | Replace terminator character in TX_FAR'sU-Fish-PC\Daniel2013-10-161-2278/+2276
* | | | | Misc text charactersU-Fish-PC\Daniel2013-10-161-8/+8
* | | | | Add PrintStatusAilmentU-Fish-PC\Daniel2013-10-151-27/+27
* | | | | Add Mon nest iconU-Fish-PC\Daniel2013-10-152-4/+5
| |_|/ / |/| | |
* | | | Merge remote-tracking branch 'kanzure/use-new-preprocessor'U-Fish-PC\Daniel2013-09-162-3/+4
|\| | |
| * | | bump and support latest pokemontoolsBryan Bishop2013-09-162-3/+4
* | | | Merge branch 'comments'U-Fish-PC\Daniel2013-09-1642-71/+71
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' into commentsU-Fish-PC\Daniel2013-09-1632-6512/+1275
| |\ \ \ | |/ / / |/| | |
* | | | revert pokemontools to 7aa016fbU-Fish-PC\Daniel2013-09-162-1/+1