aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Makefile: $: is not an escaped :yenatch2013-12-081-1/+1
* Merge remote-tracking branch 'iimarckus/master' into crystal-makefileyenatch2013-12-073-2265/+4841
|\
| * IshiharaTeamU-Fish-PC\Daniel2013-11-261-6/+20
| * FlyWarp dataU-Fish-PC\Daniel2013-11-261-43/+74
| * Evem more map scriptsU-Fish-PC\Daniel2013-11-261-1612/+2933
| * Complete Map ScriptsU-Fish-PC\Daniel2013-11-241-343/+1028
| * Unincbin more map scriptsU-Fish-PC\Daniel2013-11-171-180/+501
| * Add OAM dataU-Fish-PC\Daniel2013-11-161-12/+40
| * Dissasemble and clean upU-Fish-PC\Daniel2013-11-153-30/+135
| * Disassemble incbinned predef routinesU-Fish-PC\Daniel2013-11-151-17/+117
| * Add labels to PredefPointers:U-Fish-PC\Daniel2013-11-121-86/+100
| * Remove music.tx from Makefile for pokeblueU-Fish-PC\Daniel2013-11-101-1/+1
| * remove more redundant addressesU-Fish-PC\Daniel2013-11-091-72/+29
* | bump pokemontools for global label handlingyenatch2013-12-071-0/+0
* | 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