aboutsummaryrefslogtreecommitdiffstats
path: root/main.asm (follow)
Commit message (Expand)AuthorAgeFilesLines
* finish off wram labels and fix up mistaken label overloadsyenatch2013-12-081-19/+19
* wram labels and clarify safari zone step counteryenatch2013-12-081-9/+9
* more wram labelsyenatch2013-12-081-104/+104
* Merge remote-tracking branch 'iimarckus/master' into crystal-makefileyenatch2013-12-071-2265/+4840
|\
| * 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-151-30/+134
| * Disassemble incbinned predef routinesU-Fish-PC\Daniel2013-11-151-17/+117
| * Add labels to PredefPointers:U-Fish-PC\Daniel2013-11-121-86/+100
| * remove more redundant addressesU-Fish-PC\Daniel2013-11-091-72/+29
* | INCLUDE .asm instead of .txyenatch2013-12-071-381/+381
* | split wram/hram out of constants.asm and start using wram sectionsyenatch2013-12-051-1137/+1137
|/
* Merge branch 'master' of https://github.com/Sanky/pokeredIIMarckus2013-11-011-151/+169
|\
| * Merge remote-tracking branch 'kanzure/master' into mergetasticSanky2013-10-211-13259/+49071
| |\
| * | AskForMonNicknameSanky2013-07-041-4/+56
| * | FaintEnemyPokemonSanky2013-07-041-4/+114
| * | Disasm code which draws tiny party pokémon symbols in-battle.Sanky2013-07-031-1/+100
| * | 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-311-1296/+3701
|\ \ \
| * \ \ Merge branch 'music' of https://github.com/dannye/pokeredIIMarckus2013-10-301-1493/+2098
| |\ \ \
| | * | | Add MapSongBanks:U-Fish-PC\Daniel2013-10-241-3/+499
| | * | | Music Engine Bank 8U-Fish-PC\Daniel2013-10-241-511/+538
| | * | | Music Engine Bank 1fU-Fish-PC\Daniel2013-10-231-589/+637
| | * | | Noise_endchannel:U-Fish-PC\Daniel2013-10-221-55/+55
| | * | | Add unused sfxU-Fish-PC\Daniel2013-10-221-3/+1
| | * | | Fix blue and yellow musicU-Fish-PC\Daniel2013-10-221-14/+17
| | * | | More bank 2 music engine and music/sfx format updateU-Fish-PC\Daniel2013-10-211-128/+158
| | * | | 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-131-328/+2131
| |\| | | | | |_|/ | |/| |
| | * | Add song alternate start labelsU-Fish-PC\Daniel2013-10-141-6/+6
| | * | All music and sfxU-Fish-PC\Daniel2013-10-121-328/+2131
| * | | Fix CheckIfInOutsideMap comments.IIMarckus2013-09-251-5/+4
| |/ /
* | | 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-151-4/+4
|/ /
* | Merge branch 'master' into commentsU-Fish-PC\Daniel2013-09-161-302/+1255
|\ \
| * \ Merge pull request #1 from kanzure/dannye-incbinsdannye2013-09-101-48/+278
| |\ \
| | * \ Merge branch kanzure/master into dannye-incbinsBryan Bishop2013-09-101-3/+3
| | |\ \
| | | * \ Merge pull request #3 from dannye/commentsiimarckus2013-09-041-2/+2
| | | |\ \
| | | * \ \ Merge branch 'use-pokemontools' into masterBryan Bishop2013-09-041-1/+1
| | | |\ \ \